[llvm] r225820 - Use the integrated assembler as default on SystemZ

Ulrich Weigand ulrich.weigand at de.ibm.com
Tue Jan 13 11:45:17 PST 2015


Author: uweigand
Date: Tue Jan 13 13:45:16 2015
New Revision: 225820

URL: http://llvm.org/viewvc/llvm-project?rev=225820&view=rev
Log:
Use the integrated assembler as default on SystemZ

This was already done in clang, this commit now uses the integrated
assembler as default when using LLVM tools directly.

A number of test cases deliberately using an invalid instruction in
inline asm now have to use -no-integrated-as.


Modified:
    llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
    llvm/trunk/test/CodeGen/SystemZ/asm-01.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-02.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-03.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-04.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-05.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-06.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-07.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-08.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-09.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-10.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-11.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-12.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-13.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-14.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-15.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-16.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-17.ll
    llvm/trunk/test/CodeGen/SystemZ/asm-18.ll
    llvm/trunk/test/CodeGen/SystemZ/fp-cmp-04.ll
    llvm/trunk/test/CodeGen/SystemZ/int-cmp-44.ll
    llvm/trunk/test/CodeGen/SystemZ/int-cmp-45.ll
    llvm/trunk/test/CodeGen/SystemZ/memchr-02.ll

Modified: llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/SystemZ/MCTargetDesc/SystemZMCAsmInfo.cpp Tue Jan 13 13:45:16 2015
@@ -24,4 +24,6 @@ SystemZMCAsmInfo::SystemZMCAsmInfo(Strin
   UsesELFSectionDirectiveForBSS = true;
   SupportsDebugInformation = true;
   ExceptionsType = ExceptionHandling::DwarfCFI;
+
+  UseIntegratedAssembler = true;
 }

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-01.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-01.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-01.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-01.ll Tue Jan 13 13:45:16 2015
@@ -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) {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-02.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-02.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-02.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-02.ll Tue Jan 13 13:45:16 2015
@@ -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) {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-03.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-03.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-03.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-03.ll Tue Jan 13 13:45:16 2015
@@ -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:

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-04.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-04.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-04.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-04.ll Tue Jan 13 13:45:16 2015
@@ -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:

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-05.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-05.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-05.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-05.ll Tue Jan 13 13:45:16 2015
@@ -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:

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-06.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-06.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-06.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-06.ll Tue Jan 13 13:45:16 2015
@@ -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:

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-07.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-07.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-07.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-07.ll Tue Jan 13 13:45:16 2015
@@ -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:

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-08.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-08.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-08.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-08.ll Tue Jan 13 13:45:16 2015
@@ -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:

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-09.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-09.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-09.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-09.ll Tue Jan 13 13:45:16 2015
@@ -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:

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-10.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-10.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-10.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-10.ll Tue Jan 13 13:45:16 2015
@@ -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:

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-11.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-11.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-11.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-11.ll Tue Jan 13 13:45:16 2015
@@ -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() {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-12.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-12.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-12.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-12.ll Tue Jan 13 13:45:16 2015
@@ -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() {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-13.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-13.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-13.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-13.ll Tue Jan 13 13:45:16 2015
@@ -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() {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-14.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-14.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-14.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-14.ll Tue Jan 13 13:45:16 2015
@@ -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() {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-15.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-15.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-15.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-15.ll Tue Jan 13 13:45:16 2015
@@ -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() {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-16.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-16.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-16.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-16.ll Tue Jan 13 13:45:16 2015
@@ -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() {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-17.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-17.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-17.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-17.ll Tue Jan 13 13:45:16 2015
@@ -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() {

Modified: llvm/trunk/test/CodeGen/SystemZ/asm-18.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/asm-18.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/asm-18.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/asm-18.ll Tue Jan 13 13:45:16 2015
@@ -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) {

Modified: llvm/trunk/test/CodeGen/SystemZ/fp-cmp-04.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/fp-cmp-04.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/fp-cmp-04.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/fp-cmp-04.ll Tue Jan 13 13:45:16 2015
@@ -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)
 

Modified: llvm/trunk/test/CodeGen/SystemZ/int-cmp-44.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/int-cmp-44.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/int-cmp-44.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/int-cmp-44.ll Tue Jan 13 13:45:16 2015
@@ -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()
 

Modified: llvm/trunk/test/CodeGen/SystemZ/int-cmp-45.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/int-cmp-45.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/int-cmp-45.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/int-cmp-45.ll Tue Jan 13 13:45:16 2015
@@ -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.

Modified: llvm/trunk/test/CodeGen/SystemZ/memchr-02.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/SystemZ/memchr-02.ll?rev=225820&r1=225819&r2=225820&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/SystemZ/memchr-02.ll (original)
+++ llvm/trunk/test/CodeGen/SystemZ/memchr-02.ll Tue Jan 13 13:45:16 2015
@@ -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)
 





More information about the llvm-commits mailing list