[GlobalISel] Get the AArch64 tests to work on Linux

[rovka]

Summary

Mostly this just means changing the triple from aarch64-apple-ios to the generic aarch64--.
Only one test needs more significant changes, but GlobalISel already does the right thing so it's ok to just change the checks.

[qcolombet]

unittests/CodeGen/GlobalISel/CMakeLists.txt

3

That change shouldn't be part of this patch, should it?

[t.p.northover]

Certainly worth a try. Historically I've found generic-OS tests more trouble than they're worth, but I suppose we can sort that if they really do become a problem. Just one comment on the bigger change:

test/CodeGen/AArch64/GlobalISel/arm64-instructionselect.mir

1

It'd be better to specify -relocation-model=pic which should make sure the GOT gets used on Linux too. Hopefully that won't change anything else in this test.

[t.p.northover]

unittests/CodeGen/GlobalISel/CMakeLists.txt

3

I expect it's intentional. The linker on Linux has different name-resolution rules from macOS, I wouldn't be at all surprised if the unittest failed to link there without this line.

[rovka]

In D25532#568656, @t.p.northover wrote:

Certainly worth a try. Historically I've found generic-OS tests more trouble than they're worth, but I suppose we can sort that if they really do become a problem.

I just thought generic is better because it makes it easier to move to a new platform - you start by running the tests on it and fixing what breaks. Plus it doesn't add extra time to the tests, you just ensure coverage by adding more buildbots.
You probably have a better feel for this, so I don't mind changing to two run lines (one for iOS and one for Linux) if you think that's better.

test/CodeGen/AArch64/GlobalISel/arm64-instructionselect.mir

1

Ok, thanks, I'll give it a try. Stay tuned.

unittests/CodeGen/GlobalISel/CMakeLists.txt

3

Yup, it doesn't link without this. This might be a bug in the way our CMake files handle components, but I don't really know enough about our build system to tell.
@beanz : What do you think?

[rovka]

Unfortunately using the PIC relocation model does something different for var_local. I think it makes sense to keep both PIC and default modes for Linux, as they are both different from iOS.

[qcolombet]

LGTM.

unittests/CodeGen/GlobalISel/CMakeLists.txt

3

Thanks for the information!

test/CodeGen/AArch64/GlobalISel/arm64-fallback.ll

 ; RUN: not llc -O0 -global-isel -verify-machineinstrs %s -o - 2>&1 | FileCheck %s --check-prefix=ERROR
 ; RUN: llc -O0 -global-isel -global-isel-abort=0 -verify-machineinstrs %s -o - 2>&1 | FileCheck %s --check-prefix=FALLBACK
 ; RUN: llc -O0 -global-isel -global-isel-abort=2 -verify-machineinstrs %s -o - 2>&1 | FileCheck %s --check-prefix=FALLBACK_WITH_REPORT
 ; This file checks that the fallback path to selection dag works.
 ; The test is fragile in the sense that it must be updated to expose
 ; something that fails with global-isel.
 ; When we cannot produce a test case anymore, that means we can remove
 ; the fallback path.
 
 target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64-apple-ios"
+target triple = "aarch64--"
 
+; We use __fixunstfti as the common denominator for __fixunstfti on Linux and
+; ___fixunstfti on iOS
 ; ERROR: Unable to lower arguments
 ; FALLBACK: ldr q0,
-; FALLBACK-NEXT: bl ___fixunstfti
+; FALLBACK-NEXT: bl __fixunstfti
 ;
 ; FALLBACK_WITH_REPORT: warning: Instruction selection used fallback path for ABIi128
 ; FALLBACK_WITH_REPORT: ldr q0,
-; FALLBACK_WITH_REPORT-NEXT: bl ___fixunstfti
+; FALLBACK_WITH_REPORT-NEXT: bl __fixunstfti
 define i128 @ABIi128(i128 %arg1) {
   %farg1 =       bitcast i128 %arg1 to fp128 
   %res = fptoui fp128 %farg1 to i128
   ret i128 %res
 }

test/CodeGen/AArch64/GlobalISel/arm64-instructionselect.mir

-# RUN: llc -O0 -run-pass=instruction-select -verify-machineinstrs -global-isel %s -o - | FileCheck %s
+# RUN: llc -O0 -mtriple=aarch64-apple-ios -run-pass=instruction-select -verify-machineinstrs -global-isel %s -o - | FileCheck %s -check-prefix=CHECK -check-prefix=IOS
+# RUN: llc -O0 -mtriple=aarch64-linux-gnu -run-pass=instruction-select -verify-machineinstrs -global-isel %s -o - | FileCheck %s -check-prefix=CHECK -check-prefix=LINUX
 
 # Test the instruction selector.
 # As we support more instructions, we need to split this up.
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
 
   define void @add_s32_gpr() { ret void }
   define void @add_s64_gpr() { ret void }
 
   define void @sub_s32_gpr() { ret void }
   define void @sub_s64_gpr() { ret void }
 
   define void @or_s32_gpr() { ret void }

 # CHECK-LABEL: name: global_got
 name:            global_got
 legalized:       true
 regBankSelected: true
 registers:
   - { id: 0, class: gpr }
 
 # CHECK:  body:
-# CHECK: %0 = LOADgot @var_got
+# IOS: %0 = LOADgot @var_got
+# LINUX: %0 = MOVaddr target-flags(aarch64-page) @var_got, target-flags(aarch64-pageoff, aarch64-nc) @var_got
 body:             |
   bb.0:
     %0(p0) = G_GLOBAL_VALUE @var_got
 ...
 
 ---
 # CHECK-LABEL: name: anyext_gpr
 name:            anyext_gpr

test/CodeGen/AArch64/GlobalISel/arm64-irtranslator.ll

 ; RUN: llc -O0 -stop-after=irtranslator -global-isel -verify-machineinstrs %s -o - 2>&1 | FileCheck %s
 
 ; This file checks that the translation from llvm IR to generic MachineInstr
 ; is correct.
 target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64-apple-ios"
+target triple = "aarch64--"
 
 ; Tests for add.
 ; CHECK-LABEL: name: addi64
 ; CHECK: [[ARG1:%[0-9]+]](s64) = COPY %x0
 ; CHECK-NEXT: [[ARG2:%[0-9]+]](s64) = COPY %x1
 ; CHECK-NEXT: [[RES:%[0-9]+]](s64) = G_ADD [[ARG1]], [[ARG2]]
 ; CHECK-NEXT: %x0 = COPY [[RES]]
 ; CHECK-NEXT: RET_ReallyLR implicit %x0 

test/CodeGen/AArch64/GlobalISel/arm64-regbankselect.mir

 # RUN: llc -O0 -run-pass=regbankselect -global-isel %s -o - 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=FAST
 # RUN: llc -O0 -run-pass=regbankselect -global-isel %s -regbankselect-greedy -o - 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=GREEDY
 
 --- |
   ; ModuleID = 'generic-virtual-registers-type-error.mir'
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @defaultMapping() {
   entry:
     ret void
   }
   define void @defaultMappingVector() {
   entry:
     ret void
   }

test/CodeGen/AArch64/GlobalISel/legalize-add.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_scalar_add_big() {
   entry:
     ret void
   }
   define void @test_scalar_add_small() {
   entry:
     ret void
   }

test/CodeGen/AArch64/GlobalISel/legalize-and.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_scalar_and_small() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_scalar_and_small

test/CodeGen/AArch64/GlobalISel/legalize-cmp.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_icmp() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_icmp

test/CodeGen/AArch64/GlobalISel/legalize-combines.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_combines() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_combines

test/CodeGen/AArch64/GlobalISel/legalize-constant.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_constant() {
   entry:
     ret void
   }
   define void @test_fconstant() {
   entry:
     ret void
   }

test/CodeGen/AArch64/GlobalISel/legalize-div.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_div() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_div

test/CodeGen/AArch64/GlobalISel/legalize-ext.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_ext() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_ext

test/CodeGen/AArch64/GlobalISel/legalize-fcmp.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_icmp() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_icmp

test/CodeGen/AArch64/GlobalISel/legalize-gep.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_gep_small() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_gep_small

test/CodeGen/AArch64/GlobalISel/legalize-load-store.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_load(i8* %addr) {
   entry:
     ret void
   }
   define void @test_store(i8* %addr) {
   entry:
     ret void
   }

test/CodeGen/AArch64/GlobalISel/legalize-mul.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_scalar_mul_small() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_scalar_mul_small

test/CodeGen/AArch64/GlobalISel/legalize-or.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_scalar_or_small() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_scalar_or_small

test/CodeGen/AArch64/GlobalISel/legalize-rem.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_rem() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_rem

test/CodeGen/AArch64/GlobalISel/legalize-simple.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_simple() {
   entry:
     ret void
   next:
     ret void
   }
 ...
 

test/CodeGen/AArch64/GlobalISel/legalize-sub.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_scalar_sub_small() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_scalar_sub_small

test/CodeGen/AArch64/GlobalISel/legalize-xor.mir

 # RUN: llc -O0 -run-pass=legalize-mir -global-isel %s -o - 2>&1 | FileCheck %s
 
 --- |
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-  target triple = "aarch64-apple-ios"
+  target triple = "aarch64--"
   define void @test_scalar_xor_small() {
   entry:
     ret void
   }
 ...
 
 ---
 name:            test_scalar_xor_small

unittests/CodeGen/GlobalISel/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   GlobalISel
+  CodeGen
   )
 
 if(LLVM_BUILD_GLOBAL_ISEL)
   add_llvm_unittest(GlobalISelTests
           MachineLegalizerTest.cpp
           )
 endif()