Skip to content

[SystemZ] Introduce GNU and HLASM differences to asmwriter and update tests #113369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2024
Merged

[SystemZ] Introduce GNU and HLASM differences to asmwriter and update tests #113369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a44bf3d
Add GNU and HLASM differences to asmwriter and update tests
Oct 22, 2024
b94f34f
add check for tab character
Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMInstPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ void SystemZHLASMInstPrinter::printInst(const MCInst *MI, uint64_t Address,
StringRef Annot,
const MCSubtargetInfo &STI,
raw_ostream &O) {
printInstruction(MI, Address, O);
std::string Str;
raw_string_ostream RSO(Str);
printInstruction(MI, Address, RSO);
// Eat the first tab character and replace it with a space since it is
// hardcoded in AsmWriterEmitter::EmitPrintInstruction
// TODO: introduce a line prefix member to AsmWriter to avoid this problem
if (!Str.empty() && Str.front() == '\t')
O << " " << Str.substr(1, Str.length());
else
O << Str;

printAnnotation(O, Annot);
}
3 changes: 2 additions & 1 deletion llvm/lib/Target/SystemZ/SystemZInstrFormats.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ class InstSystemZ<int size, dag outs, dag ins, string asmstr,
dag InOperandList = ins;
let Size = size;
let Pattern = pattern;
let AsmString = asmstr;
// Convert tabs to spaces, and remove space after comma for HLASM syntax
let AsmString = !subst("\t", "{\t| }", !subst(", ", "{, |,}", asmstr));

let hasSideEffects = 0;
let mayLoad = 0;
Expand Down
88 changes: 44 additions & 44 deletions llvm/test/CodeGen/SystemZ/call-zos-01.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,81 +3,81 @@
; RUN: llc < %s -mtriple=s390x-ibm-zos -mcpu=z10 | FileCheck %s

; CHECK-LABEL: call_char:
; CHECK: lghi 1, 8
; CHECK: lghi 1,8
define i8 @call_char(){
%retval = call i8 (i8) @pass_char(i8 8)
ret i8 %retval
}

; CHECK-LABEL: call_short:
; CHECK: lghi 1, 16
; CHECK: lghi 1,16
define i16 @call_short() {
entry:
%retval = call i16 (i16) @pass_short(i16 16)
ret i16 %retval
}

; CHECK-LABEL: call_int:
; CHECK: lghi 1, 32
; CHECK: lghi 2, 33
; CHECK: lghi 1,32
; CHECK: lghi 2,33
define i32 @call_int() {
entry:
%retval = call i32 (i32, i32) @pass_int(i32 32, i32 33)
ret i32 %retval
}

; CHECK-LABEL: call_long:
; CHECK: lghi 1, 64
; CHECK: lghi 2, 65
; CHECK: lghi 3, 66
; CHECK: lghi 1,64
; CHECK: lghi 2,65
; CHECK: lghi 3,66
define i64 @call_long() {
entry:
%retval = call i64 (i64, i64, i64) @pass_long(i64 64, i64 65, i64 66)
ret i64 %retval
}

; CHECK-LABEL: call_ptr:
; CHECK: lgr 1, 2
; CHECK: lgr 1,2
define i32 @call_ptr(ptr %p1, ptr %p2) {
entry:
%retval = call i32 (ptr) @pass_ptr(ptr %p2)
ret i32 %retval
}

; CHECK-LABEL: call_integrals:
; CHECK: lghi 1, 64
; CHECK: lghi 2, 32
; CHECK: lghi 3, 16
; CHECK: lghi 1,64
; CHECK: lghi 2,32
; CHECK: lghi 3,16
define i64 @call_integrals() {
entry:
%retval = call i64 (i64, i32, i16, i64) @pass_integrals0(i64 64, i32 32, i16 16, i64 128)
ret i64 %retval
}

; CHECK-LABEL: pass_char:
; CHECK: lgr 3, 1
; CHECK: lgr 3,1
define signext i8 @pass_char(i8 signext %arg) {
entry:
ret i8 %arg
}

; CHECK-LABEL: pass_short:
; CHECK: lgr 3, 1
; CHECK: lgr 3,1
define signext i16 @pass_short(i16 signext %arg) {
entry:
ret i16 %arg
}

; CHECK-LABEL: pass_int:
; CHECK: lgr 3, 2
; CHECK: lgr 3,2
define signext i32 @pass_int(i32 signext %arg0, i32 signext %arg1) {
entry:
ret i32 %arg1
}

; CHECK-LABEL: pass_long:
; CHECK: agr 1, 2
; CHECK: agr 3, 1
; CHECK: agr 1,2
; CHECK: agr 3,1
define signext i64 @pass_long(i64 signext %arg0, i64 signext %arg1, i64 signext %arg2) {
entry:
%N = add i64 %arg0, %arg1
Expand All @@ -86,8 +86,8 @@ entry:
}

; CHECK-LABEL: pass_integrals0:
; CHECK: ag 2, 2200(4)
; CHECK-NEXT: lgr 3, 2
; CHECK: ag 2,2200(4)
; CHECK-NEXT: lgr 3,2
define signext i64 @pass_integrals0(i64 signext %arg0, i32 signext %arg1, i16 signext %arg2, i64 signext %arg3) {
entry:
%N = sext i32 %arg1 to i64
Expand All @@ -96,88 +96,88 @@ entry:
}

; CHECK-LABEL: call_float:
; CHECK: le 0, 0({{[0-9]}})
; CHECK: le 0,0({{[0-9]}})
define float @call_float() {
entry:
%ret = call float (float) @pass_float(float 0x400921FB60000000)
ret float %ret
}

; CHECK-LABEL: call_double:
; CHECK: larl [[GENREG:[0-9]+]], L#{{CPI[0-9]+_[0-9]+}}
; CHECK-NEXT: ld 0, 0([[GENREG]])
; CHECK: larl [[GENREG:[0-9]+]],L#{{CPI[0-9]+_[0-9]+}}
; CHECK-NEXT: ld 0,0([[GENREG]])
define double @call_double() {
entry:
%ret = call double (double) @pass_double(double 3.141000e+00)
ret double %ret
}

; CHECK-LABEL: call_longdouble:
; CHECK: larl [[GENREG:[0-9]+]], L#{{CPI[0-9]+_[0-9]+}}
; CHECK-NEXT: ld 0, 0([[GENREG]])
; CHECK-NEXT: ld 2, 8([[GENREG]])
; CHECK: larl [[GENREG:[0-9]+]],L#{{CPI[0-9]+_[0-9]+}}
; CHECK-NEXT: ld 0,0([[GENREG]])
; CHECK-NEXT: ld 2,8([[GENREG]])
define fp128 @call_longdouble() {
entry:
%ret = call fp128 (fp128) @pass_longdouble(fp128 0xLE0FC1518450562CD4000921FB5444261)
ret fp128 %ret
}

; CHECK-LABEL: call_floats0
; CHECK: larl [[GENREG:[0-9]+]], L#{{CPI[0-9]+_[0-9]+}}
; CHECK-NEXT: ld 1, 0([[GENREG]])
; CHECK-NEXT: ld 3, 8([[GENREG]])
; CHECK: lxr 5, 0
; CHECK: lxr 0, 1
; CHECK: lxr 4, 5
; CHECK: larl [[GENREG:[0-9]+]],L#{{CPI[0-9]+_[0-9]+}}
; CHECK-NEXT: ld 1,0([[GENREG]])
; CHECK-NEXT: ld 3,8([[GENREG]])
; CHECK: lxr 5,0
; CHECK: lxr 0,1
; CHECK: lxr 4,5
define i64 @call_floats0(fp128 %arg0, double %arg1) {
entry:
%ret = call i64 (fp128, fp128, double) @pass_floats0(fp128 0xLE0FC1518450562CD4000921FB5444261, fp128 %arg0, double %arg1)
ret i64 %ret
}

; CHECK-LABEL: call_floats1
; CHECK: lxr 1, 0
; CHECK: ldr 0, 4
; CHECK: lxr 4, 1
; CHECK: lxr 1,0
; CHECK: ldr 0,4
; CHECK: lxr 4,1
define i64 @call_floats1(fp128 %arg0, double %arg1) {
entry:
%ret = call i64 (double, fp128) @pass_floats1(double %arg1, fp128 %arg0)
ret i64 %ret
}

; CHECK-LABEL: pass_float:
; CHECK: larl 1, L#{{CPI[0-9]+_[0-9]+}}
; CHECK: aeb 0, 0(1)
; CHECK: larl 1,L#{{CPI[0-9]+_[0-9]+}}
; CHECK: aeb 0,0(1)
define float @pass_float(float %arg) {
entry:
%X = fadd float %arg, 0x400821FB60000000
ret float %X
}

; CHECK-LABEL: pass_double:
; CHECK: larl 1, L#{{CPI[0-9]+_[0-9]+}}
; CHECK: adb 0, 0(1)
; CHECK: larl 1,L#{{CPI[0-9]+_[0-9]+}}
; CHECK: adb 0,0(1)
define double @pass_double(double %arg) {
entry:
%X = fadd double %arg, 1.414213e+00
ret double %X
}

; CHECK-LABEL: pass_longdouble
; CHECK: larl 1, L#{{CPI[0-9]+_[0-9]+}}
; CHECK: lxdb 1, 0(1)
; CHECK: axbr 0, 1
; CHECK: larl 1,L#{{CPI[0-9]+_[0-9]+}}
; CHECK: lxdb 1,0(1)
; CHECK: axbr 0,1
define fp128 @pass_longdouble(fp128 %arg) {
entry:
%X = fadd fp128 %arg, 0xL10000000000000004000921FB53C8D4F
ret fp128 %X
}

; CHECK-LABEL: pass_floats0
; CHECK: larl 1, L#{{CPI[0-9]+_[0-9]+}}
; CHECK: axbr 0, 4
; CHECK: axbr 1, 0
; CHECK: cxbr 1, 5
; CHECK: larl 1,L#{{CPI[0-9]+_[0-9]+}}
; CHECK: axbr 0,4
; CHECK: axbr 1,0
; CHECK: cxbr 1,5
define i64 @pass_floats0(fp128 %arg0, fp128 %arg1, double %arg2) {
%X = fadd fp128 %arg0, %arg1
%arg2_ext = fpext double %arg2 to fp128
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/SystemZ/call-zos-02.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ entry:
define hidden signext i32 @caller2() {
entry:
; CHECK-LABEL: caller2:
; CHECK: brasl 7, caller@PLT * encoding: [0xc0,0x75,A,A,A,A]
; CHECK: brasl 7,caller@PLT * encoding: [0xc0,0x75,A,A,A,A]
; CHECK-NEXT: * fixup A - offset: 2, value: caller@PLT+2, kind: FK_390_PC32DBL
; CHECK-NEXT: bcr 0, 3 * encoding: [0x07,0x03]
; CHECK-NEXT: bcr 0,3 * encoding: [0x07,0x03]
%call = call signext i32 @caller()
ret i32 %call
}
26 changes: 13 additions & 13 deletions llvm/test/CodeGen/SystemZ/call-zos-i128.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
; RUN: llc < %s -mtriple=s390x-ibm-zos -mcpu=z13 | FileCheck %s

; CHECK-LABEL: call_i128:
; CHECK-DAG: larl 1, L#CPI0_0
; CHECK-DAG: vl 0, 0(1), 3
; CHECK-DAG: vst 0, 2256(4), 3
; CHECK-DAG: larl 1, L#CPI0_1
; CHECK-DAG: vl 0, 0(1), 3
; CHECK-DAG: vst 0, 2272(4), 3
; CHECK-DAG: la 1, 2288(4)
; CHECK-DAG: la 2, 2272(4)
; CHECK-DAG: la 3, 2256(4)
; CHECK-DAG: larl 1,L#CPI0_0
; CHECK-DAG: vl 0,0(1),3
; CHECK-DAG: vst 0,2256(4),3
; CHECK-DAG: larl 1,L#CPI0_1
; CHECK-DAG: vl 0,0(1),3
; CHECK-DAG: vst 0,2272(4),3
; CHECK-DAG: la 1,2288(4)
; CHECK-DAG: la 2,2272(4)
; CHECK-DAG: la 3,2256(4)

define i128 @call_i128() {
entry:
Expand All @@ -20,10 +20,10 @@ entry:
}

; CHECK-LABEL: pass_i128:
; CHECK: vl 0, 0(3), 3
; CHECK: vl 1, 0(2), 3
; CHECK: vaq 0, 1, 0
; CHECK: vst 0, 0(1), 3
; CHECK: vl 0,0(3),3
; CHECK: vl 1,0(2),3
; CHECK: vaq 0,1,0
; CHECK: vst 0,0(1),3
define i128 @pass_i128(i128 %arg0, i128 %arg1) {
entry:
%N = add i128 %arg0, %arg1
Expand Down
Loading
Loading