diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp index 35887faef831..0161d6263e7d 100644 --- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp +++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp @@ -24,4 +24,6 @@ SystemZMCAsmInfo::SystemZMCAsmInfo(StringRef TT) { UsesELFSectionDirectiveForBSS = true; SupportsDebugInformation = true; ExceptionsType = ExceptionHandling::DwarfCFI; + + UseIntegratedAssembler = true; } diff --git a/llvm/test/CodeGen/SystemZ/asm-01.ll b/llvm/test/CodeGen/SystemZ/asm-01.ll index 801378c5fcbd..3dbc8ac268b7 100644 --- a/llvm/test/CodeGen/SystemZ/asm-01.ll +++ b/llvm/test/CodeGen/SystemZ/asm-01.ll @@ -1,7 +1,7 @@ ; Test the "Q" asm constraint, which accepts addresses that have a base ; and a 12-bit displacement. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Check the lowest range. define void @f1(i64 %base) { diff --git a/llvm/test/CodeGen/SystemZ/asm-02.ll b/llvm/test/CodeGen/SystemZ/asm-02.ll index ad1e35bb3621..458bfeb49753 100644 --- a/llvm/test/CodeGen/SystemZ/asm-02.ll +++ b/llvm/test/CodeGen/SystemZ/asm-02.ll @@ -1,7 +1,7 @@ ; Test the "R" asm constraint, which accepts addresses that have a base, ; an index and a 12-bit displacement. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Check the lowest range. define void @f1(i64 %base) { diff --git a/llvm/test/CodeGen/SystemZ/asm-03.ll b/llvm/test/CodeGen/SystemZ/asm-03.ll index fa3e1a7d01d8..2e60ad61ef40 100644 --- a/llvm/test/CodeGen/SystemZ/asm-03.ll +++ b/llvm/test/CodeGen/SystemZ/asm-03.ll @@ -1,7 +1,7 @@ ; Test the "S" asm constraint, which accepts addresses that have a base ; and a 20-bit displacement. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s define void @f1(i64 %base) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/SystemZ/asm-04.ll b/llvm/test/CodeGen/SystemZ/asm-04.ll index af7ea9fdef94..b212253dbd9c 100644 --- a/llvm/test/CodeGen/SystemZ/asm-04.ll +++ b/llvm/test/CodeGen/SystemZ/asm-04.ll @@ -1,7 +1,7 @@ ; Test the "T" asm constraint, which accepts addresses that have a base, ; an index and a 20-bit displacement. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s define void @f1(i64 %base) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/SystemZ/asm-05.ll b/llvm/test/CodeGen/SystemZ/asm-05.ll index e18cb757b142..db99b10853ed 100644 --- a/llvm/test/CodeGen/SystemZ/asm-05.ll +++ b/llvm/test/CodeGen/SystemZ/asm-05.ll @@ -1,6 +1,6 @@ ; Test the "m" asm constraint, which is equivalent to "T". ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s define void @f1(i64 %base) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/SystemZ/asm-06.ll b/llvm/test/CodeGen/SystemZ/asm-06.ll index f9848a2df6fc..73c938f9fcf8 100644 --- a/llvm/test/CodeGen/SystemZ/asm-06.ll +++ b/llvm/test/CodeGen/SystemZ/asm-06.ll @@ -1,6 +1,6 @@ ; Test the GPR constraint "a", which forbids %r0. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s define i64 @f1() { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/SystemZ/asm-07.ll b/llvm/test/CodeGen/SystemZ/asm-07.ll index bf63150cd818..42b89e6115bf 100644 --- a/llvm/test/CodeGen/SystemZ/asm-07.ll +++ b/llvm/test/CodeGen/SystemZ/asm-07.ll @@ -1,6 +1,6 @@ ; Test the GPR constraint "r". ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s define i64 @f1() { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/SystemZ/asm-08.ll b/llvm/test/CodeGen/SystemZ/asm-08.ll index 166233752db2..4185108e73c5 100644 --- a/llvm/test/CodeGen/SystemZ/asm-08.ll +++ b/llvm/test/CodeGen/SystemZ/asm-08.ll @@ -1,6 +1,6 @@ ; Test the GPR constraint "d", which is equivalent to "r". ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s define i64 @f1() { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/SystemZ/asm-09.ll b/llvm/test/CodeGen/SystemZ/asm-09.ll index 5cd7efb94009..b9d86cfbfebb 100644 --- a/llvm/test/CodeGen/SystemZ/asm-09.ll +++ b/llvm/test/CodeGen/SystemZ/asm-09.ll @@ -1,6 +1,6 @@ ; Test matching operands with the GPR constraint "r". ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s define void @f1(i32 *%dst) { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/SystemZ/asm-10.ll b/llvm/test/CodeGen/SystemZ/asm-10.ll index 0eccc1972187..b71db8350781 100644 --- a/llvm/test/CodeGen/SystemZ/asm-10.ll +++ b/llvm/test/CodeGen/SystemZ/asm-10.ll @@ -1,6 +1,6 @@ ; Test the FPR constraint "f". ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s define float @f1() { ; CHECK-LABEL: f1: diff --git a/llvm/test/CodeGen/SystemZ/asm-11.ll b/llvm/test/CodeGen/SystemZ/asm-11.ll index 8aeb784134a3..8a4cdbb6a932 100644 --- a/llvm/test/CodeGen/SystemZ/asm-11.ll +++ b/llvm/test/CodeGen/SystemZ/asm-11.ll @@ -1,6 +1,6 @@ ; Test the "I" constraint (8-bit unsigned constants). ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Test 1 below the first valid value. define i32 @f1() { diff --git a/llvm/test/CodeGen/SystemZ/asm-12.ll b/llvm/test/CodeGen/SystemZ/asm-12.ll index feecbacf09e8..115092cb6aa5 100644 --- a/llvm/test/CodeGen/SystemZ/asm-12.ll +++ b/llvm/test/CodeGen/SystemZ/asm-12.ll @@ -1,6 +1,6 @@ ; Test the "J" constraint (12-bit unsigned constants). ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Test 1 below the first valid value. define i32 @f1() { diff --git a/llvm/test/CodeGen/SystemZ/asm-13.ll b/llvm/test/CodeGen/SystemZ/asm-13.ll index b88170079ecc..83454eab1cb1 100644 --- a/llvm/test/CodeGen/SystemZ/asm-13.ll +++ b/llvm/test/CodeGen/SystemZ/asm-13.ll @@ -1,6 +1,6 @@ ; Test the "K" constraint (16-bit signed constants). ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Test 1 below the first valid value. define i32 @f1() { diff --git a/llvm/test/CodeGen/SystemZ/asm-14.ll b/llvm/test/CodeGen/SystemZ/asm-14.ll index bcd8b1ebc3df..41b8f40e09d4 100644 --- a/llvm/test/CodeGen/SystemZ/asm-14.ll +++ b/llvm/test/CodeGen/SystemZ/asm-14.ll @@ -1,6 +1,6 @@ ; Test the "L" constraint (20-bit signed constants). ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Test 1 below the first valid value. define i32 @f1() { diff --git a/llvm/test/CodeGen/SystemZ/asm-15.ll b/llvm/test/CodeGen/SystemZ/asm-15.ll index 886ee0e897dc..8361b6849923 100644 --- a/llvm/test/CodeGen/SystemZ/asm-15.ll +++ b/llvm/test/CodeGen/SystemZ/asm-15.ll @@ -1,6 +1,6 @@ ; Test the "M" constraint (0x7fffffff) ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Test 1 below the valid value. define i32 @f1() { diff --git a/llvm/test/CodeGen/SystemZ/asm-16.ll b/llvm/test/CodeGen/SystemZ/asm-16.ll index 886ee0e897dc..8361b6849923 100644 --- a/llvm/test/CodeGen/SystemZ/asm-16.ll +++ b/llvm/test/CodeGen/SystemZ/asm-16.ll @@ -1,6 +1,6 @@ ; Test the "M" constraint (0x7fffffff) ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Test 1 below the valid value. define i32 @f1() { diff --git a/llvm/test/CodeGen/SystemZ/asm-17.ll b/llvm/test/CodeGen/SystemZ/asm-17.ll index 7bc9da32ea95..533b5e90d62d 100644 --- a/llvm/test/CodeGen/SystemZ/asm-17.ll +++ b/llvm/test/CodeGen/SystemZ/asm-17.ll @@ -1,6 +1,6 @@ ; Test explicit register names. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s ; Test i32 GPRs. define i32 @f1() { diff --git a/llvm/test/CodeGen/SystemZ/asm-18.ll b/llvm/test/CodeGen/SystemZ/asm-18.ll index d60654b7863d..71e145a285ff 100644 --- a/llvm/test/CodeGen/SystemZ/asm-18.ll +++ b/llvm/test/CodeGen/SystemZ/asm-18.ll @@ -1,7 +1,7 @@ ; Test high-word operations, using "h" constraints to force a high ; register and "r" constraints to force a low register. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z196 | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z196 -no-integrated-as | FileCheck %s ; Test loads and stores involving mixtures of high and low registers. define void @f1(i32 *%ptr1, i32 *%ptr2) { diff --git a/llvm/test/CodeGen/SystemZ/fp-cmp-04.ll b/llvm/test/CodeGen/SystemZ/fp-cmp-04.ll index 781a3beb4d4d..1637ccb0791b 100644 --- a/llvm/test/CodeGen/SystemZ/fp-cmp-04.ll +++ b/llvm/test/CodeGen/SystemZ/fp-cmp-04.ll @@ -1,7 +1,7 @@ ; Test that floating-point compares are omitted if CC already has the ; right value. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z10 | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z10 -no-integrated-as | FileCheck %s declare float @llvm.fabs.f32(float %f) diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-44.ll b/llvm/test/CodeGen/SystemZ/int-cmp-44.ll index f065e6421295..30c1c4f1ed6c 100644 --- a/llvm/test/CodeGen/SystemZ/int-cmp-44.ll +++ b/llvm/test/CodeGen/SystemZ/int-cmp-44.ll @@ -1,7 +1,7 @@ ; Test that compares are omitted if CC already has the right value ; (z10 version). ; -; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z10 | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z10 -no-integrated-as | FileCheck %s declare void @foo() diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-45.ll b/llvm/test/CodeGen/SystemZ/int-cmp-45.ll index 9c9c49c05df1..c9affa672d54 100644 --- a/llvm/test/CodeGen/SystemZ/int-cmp-45.ll +++ b/llvm/test/CodeGen/SystemZ/int-cmp-45.ll @@ -1,7 +1,7 @@ ; Test that compares are omitted if CC already has the right value ; (z196 version). ; -; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z196 | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z196 -no-integrated-as | FileCheck %s ; Addition provides enough for equality comparisons with zero. First teest ; the EQ case with LOC. diff --git a/llvm/test/CodeGen/SystemZ/memchr-02.ll b/llvm/test/CodeGen/SystemZ/memchr-02.ll index 982b3964f190..8986627a6057 100644 --- a/llvm/test/CodeGen/SystemZ/memchr-02.ll +++ b/llvm/test/CodeGen/SystemZ/memchr-02.ll @@ -1,6 +1,6 @@ ; Test memchr using SRST, with the correct prototype. ; -; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s +; RUN: llc < %s -mtriple=s390x-linux-gnu -no-integrated-as | FileCheck %s declare i8 *@memchr(i8 *%src, i32 %char, i64 %len)