Revert but update 128-bit tests

Author: JonPsson1

llvm/test/CodeGen/SystemZ/atomic-load-02.ll

@@ -1,33 +1,11 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; Test 16-bit atomic loads. Expect libcall without natural alignment.
+; Test 16-bit atomic loads.
 ;
 ; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s
 
 define i16 @f1(ptr %src) {
 ; CHECK-LABEL: f1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    lh %r2, 0(%r2)
-; CHECK-NEXT:    br %r14
+; CHECK: lh %r2, 0(%r2)
+; CHECK: br %r14
   %val = load atomic i16, ptr %src seq_cst, align 2
   ret i16 %val
 }
-
-define i16 @f2(ptr %src) {
-; CHECK-LABEL: f2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
-; CHECK-NEXT:    .cfi_offset %r14, -48
-; CHECK-NEXT:    .cfi_offset %r15, -40
-; CHECK-NEXT:    aghi %r15, -168
-; CHECK-NEXT:    .cfi_def_cfa_offset 328
-; CHECK-NEXT:    lgr %r3, %r2
-; CHECK-NEXT:    la %r4, 166(%r15)
-; CHECK-NEXT:    lghi %r2, 2
-; CHECK-NEXT:    lhi %r5, 5
-; CHECK-NEXT:    brasl %r14, __atomic_load@PLT
-; CHECK-NEXT:    lh %r2, 166(%r15)
-; CHECK-NEXT:    lmg %r14, %r15, 280(%r15)
-; CHECK-NEXT:    br %r14
-  %val = load atomic i16, ptr %src seq_cst, align 1
-  ret i16 %val
-}

llvm/test/CodeGen/SystemZ/atomic-load-03.ll

@@ -1,33 +1,11 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; Test 32-bit atomic loads. Expect libcall without natural alignment.
+; Test 32-bit atomic loads.
 ;
 ; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s
 
 define i32 @f1(ptr %src) {
 ; CHECK-LABEL: f1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    l %r2, 0(%r2)
-; CHECK-NEXT:    br %r14
+; CHECK: l %r2, 0(%r2)
+; CHECK: br %r14
   %val = load atomic i32, ptr %src seq_cst, align 4
   ret i32 %val
 }
-
-define i32 @f2(ptr %src) {
-; CHECK-LABEL: f2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
-; CHECK-NEXT:    .cfi_offset %r14, -48
-; CHECK-NEXT:    .cfi_offset %r15, -40
-; CHECK-NEXT:    aghi %r15, -168
-; CHECK-NEXT:    .cfi_def_cfa_offset 328
-; CHECK-NEXT:    lgr %r3, %r2
-; CHECK-NEXT:    la %r4, 164(%r15)
-; CHECK-NEXT:    lghi %r2, 4
-; CHECK-NEXT:    lhi %r5, 5
-; CHECK-NEXT:    brasl %r14, __atomic_load@PLT
-; CHECK-NEXT:    l %r2, 164(%r15)
-; CHECK-NEXT:    lmg %r14, %r15, 280(%r15)
-; CHECK-NEXT:    br %r14
-  %val = load atomic i32, ptr %src seq_cst, align 2
-  ret i32 %val
-}

llvm/test/CodeGen/SystemZ/atomic-load-04.ll

@@ -1,33 +1,11 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; Test 64-bit atomic loads. Expect libcall without natural alignment.
+; Test 64-bit atomic loads.
 ;
 ; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s
 
 define i64 @f1(ptr %src) {
 ; CHECK-LABEL: f1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    lg %r2, 0(%r2)
-; CHECK-NEXT:    br %r14
+; CHECK: lg %r2, 0(%r2)
+; CHECK: br %r14
   %val = load atomic i64, ptr %src seq_cst, align 8
   ret i64 %val
 }
-
-define i64 @f2(ptr %src) {
-; CHECK-LABEL: f2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
-; CHECK-NEXT:    .cfi_offset %r14, -48
-; CHECK-NEXT:    .cfi_offset %r15, -40
-; CHECK-NEXT:    aghi %r15, -168
-; CHECK-NEXT:    .cfi_def_cfa_offset 328
-; CHECK-NEXT:    lgr %r3, %r2
-; CHECK-NEXT:    la %r4, 160(%r15)
-; CHECK-NEXT:    lghi %r2, 8
-; CHECK-NEXT:    lhi %r5, 5
-; CHECK-NEXT:    brasl %r14, __atomic_load@PLT
-; CHECK-NEXT:    lg %r2, 160(%r15)
-; CHECK-NEXT:    lmg %r14, %r15, 280(%r15)
-; CHECK-NEXT:    br %r14
-  %val = load atomic i64, ptr %src seq_cst, align 4
-  ret i64 %val
-}

llvm/test/CodeGen/SystemZ/atomic-load-05.ll

@@ -1,65 +1,14 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; Test 128-bit atomic loads. Expect libcall without natural alignment.
+; Test 128-bit integer atomic loads.
 ;
 ; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s
-; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 | FileCheck %s --check-prefix=Z13
+; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 | FileCheck %s
 
 define i128 @f1(ptr %src) {
 ; CHECK-LABEL: f1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    lpq %r0, 0(%r3)
-; CHECK-NEXT:    stg %r1, 8(%r2)
-; CHECK-NEXT:    stg %r0, 0(%r2)
-; CHECK-NEXT:    br %r14
-;
-; Z13-LABEL: f1:
-; Z13:       # %bb.0:
-; Z13-NEXT:    lpq %r0, 0(%r3)
-; Z13-NEXT:    stg %r1, 8(%r2)
-; Z13-NEXT:    stg %r0, 0(%r2)
-; Z13-NEXT:    br %r14
+; CHECK: lpq %r0, 0(%r3)
+; CHECK-DAG: stg %r1, 8(%r2)
+; CHECK-DAG: stg %r0, 0(%r2)
+; CHECK: br %r14
   %val = load atomic i128, ptr %src seq_cst, align 16
   ret i128 %val
 }
-
-define i128 @f2(ptr %src) {
-; CHECK-LABEL: f2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    stmg %r13, %r15, 104(%r15)
-; CHECK-NEXT:    .cfi_offset %r13, -56
-; CHECK-NEXT:    .cfi_offset %r14, -48
-; CHECK-NEXT:    .cfi_offset %r15, -40
-; CHECK-NEXT:    aghi %r15, -176
-; CHECK-NEXT:    .cfi_def_cfa_offset 336
-; CHECK-NEXT:    lgr %r13, %r2
-; CHECK-NEXT:    la %r4, 160(%r15)
-; CHECK-NEXT:    lghi %r2, 16
-; CHECK-NEXT:    lhi %r5, 5
-; CHECK-NEXT:    brasl %r14, __atomic_load@PLT
-; CHECK-NEXT:    lg %r0, 168(%r15)
-; CHECK-NEXT:    lg %r1, 160(%r15)
-; CHECK-NEXT:    stg %r0, 8(%r13)
-; CHECK-NEXT:    stg %r1, 0(%r13)
-; CHECK-NEXT:    lmg %r13, %r15, 280(%r15)
-; CHECK-NEXT:    br %r14
-;
-; Z13-LABEL: f2:
-; Z13:       # %bb.0:
-; Z13-NEXT:    stmg %r13, %r15, 104(%r15)
-; Z13-NEXT:    .cfi_offset %r13, -56
-; Z13-NEXT:    .cfi_offset %r14, -48
-; Z13-NEXT:    .cfi_offset %r15, -40
-; Z13-NEXT:    aghi %r15, -176
-; Z13-NEXT:    .cfi_def_cfa_offset 336
-; Z13-NEXT:    lgr %r13, %r2
-; Z13-NEXT:    la %r4, 160(%r15)
-; Z13-NEXT:    lghi %r2, 16
-; Z13-NEXT:    lhi %r5, 5
-; Z13-NEXT:    brasl %r14, __atomic_load@PLT
-; Z13-NEXT:    vl %v0, 160(%r15), 3
-; Z13-NEXT:    vst %v0, 0(%r13), 3
-; Z13-NEXT:    lmg %r13, %r15, 280(%r15)
-; Z13-NEXT:    br %r14
-  %val = load atomic i128, ptr %src seq_cst, align 8
-  ret i128 %val
-}

llvm/test/CodeGen/SystemZ/atomic-load-06.ll

@@ -1,58 +1,13 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; Test float atomic loads. Expect libcall without natural alignment.
+; Test float atomic loads.
 ;
 ; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s
-; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z14 | FileCheck %s --check-prefix=Z14
 
 define float @f1(ptr %src) {
 ; CHECK-LABEL: f1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    lgf %r0, 0(%r2)
-; CHECK-NEXT:    sllg %r0, %r0, 32
-; CHECK-NEXT:    ldgr %f0, %r0
-; CHECK-NEXT:    # kill: def $f0s killed $f0s killed $f0d
-; CHECK-NEXT:    br %r14
-;
-; Z14-LABEL: f1:
-; Z14:       # %bb.0:
-; Z14-NEXT:    lde %f0, 0(%r2)
-; Z14-NEXT:    br %r14
+; CHECK: lgf [[R:%r[0-9]+]], 0(%r2)
+; CHECK: sllg [[R]], [[R]], 32
+; CHECK: ldgr %f0, [[R]]
+; CHECK: br %r14
   %val = load atomic float, ptr %src seq_cst, align 4
   ret float %val
 }
-
-define float @f2(ptr %src) {
-; CHECK-LABEL: f2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
-; CHECK-NEXT:    .cfi_offset %r14, -48
-; CHECK-NEXT:    .cfi_offset %r15, -40
-; CHECK-NEXT:    aghi %r15, -168
-; CHECK-NEXT:    .cfi_def_cfa_offset 328
-; CHECK-NEXT:    lgr %r3, %r2
-; CHECK-NEXT:    la %r4, 164(%r15)
-; CHECK-NEXT:    lghi %r2, 4
-; CHECK-NEXT:    lhi %r5, 5
-; CHECK-NEXT:    brasl %r14, __atomic_load@PLT
-; CHECK-NEXT:    le %f0, 164(%r15)
-; CHECK-NEXT:    lmg %r14, %r15, 280(%r15)
-; CHECK-NEXT:    br %r14
-;
-; Z14-LABEL: f2:
-; Z14:       # %bb.0:
-; Z14-NEXT:    stmg %r14, %r15, 112(%r15)
-; Z14-NEXT:    .cfi_offset %r14, -48
-; Z14-NEXT:    .cfi_offset %r15, -40
-; Z14-NEXT:    aghi %r15, -168
-; Z14-NEXT:    .cfi_def_cfa_offset 328
-; Z14-NEXT:    lgr %r3, %r2
-; Z14-NEXT:    la %r4, 164(%r15)
-; Z14-NEXT:    lghi %r2, 4
-; Z14-NEXT:    lhi %r5, 5
-; Z14-NEXT:    brasl %r14, __atomic_load@PLT
-; Z14-NEXT:    lde %f0, 164(%r15)
-; Z14-NEXT:    lmg %r14, %r15, 280(%r15)
-; Z14-NEXT:    br %r14
-  %val = load atomic float, ptr %src seq_cst, align 2
-  ret float %val
-}

llvm/test/CodeGen/SystemZ/atomic-load-07.ll

@@ -1,33 +1,11 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; Test double atomic loads. Expect libcall without natural alignment.
+; Test double atomic loads.
 ;
 ; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s
 
 define double @f1(ptr %src) {
 ; CHECK-LABEL: f1:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    ld %f0, 0(%r2)
-; CHECK-NEXT:    br %r14
+; CHECK: ld %f0, 0(%r2)
+; CHECK: br %r14
   %val = load atomic double, ptr %src seq_cst, align 8
   ret double %val
 }
-
-define double @f2(ptr %src) {
-; CHECK-LABEL: f2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
-; CHECK-NEXT:    .cfi_offset %r14, -48
-; CHECK-NEXT:    .cfi_offset %r15, -40
-; CHECK-NEXT:    aghi %r15, -168
-; CHECK-NEXT:    .cfi_def_cfa_offset 328
-; CHECK-NEXT:    lgr %r3, %r2
-; CHECK-NEXT:    la %r4, 160(%r15)
-; CHECK-NEXT:    lghi %r2, 8
-; CHECK-NEXT:    lhi %r5, 5
-; CHECK-NEXT:    brasl %r14, __atomic_load@PLT
-; CHECK-NEXT:    ld %f0, 160(%r15)
-; CHECK-NEXT:    lmg %r14, %r15, 280(%r15)
-; CHECK-NEXT:    br %r14
-  %val = load atomic double, ptr %src seq_cst, align 4
-  ret double %val
-}

llvm/test/CodeGen/SystemZ/atomic-load-08.ll

@@ -1,67 +1,19 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
-; Test long double atomic loads. Expect libcall without natural alignment.
+;
+; Test long double atomic loads. These are emitted by the Clang FE as i128
+; loads with a bitcast, and this test case gets converted into that form as
+; well by the AtomicExpand pass.
 ;
 ; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s
-; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z14 | FileCheck %s --check-prefix=Z14
 
-define void @fun1(ptr %ret, ptr %src) {
-; CHECK-LABEL: fun1:
+define void @f1(ptr %ret, ptr %src) {
+; CHECK-LABEL: f1:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    lpq %r0, 0(%r3)
 ; CHECK-NEXT:    stg %r1, 8(%r2)
 ; CHECK-NEXT:    stg %r0, 0(%r2)
 ; CHECK-NEXT:    br %r14
-;
-; Z14-LABEL: fun1:
-; Z14:       # %bb.0:
-; Z14-NEXT:    lpq %r0, 0(%r3)
-; Z14-NEXT:    stg %r1, 8(%r2)
-; Z14-NEXT:    stg %r0, 0(%r2)
-; Z14-NEXT:    br %r14
   %val = load atomic fp128, ptr %src seq_cst, align 16
   store fp128 %val, ptr %ret, align 8
   ret void
 }
-
-define void @fun2(ptr %ret, ptr %src) {
-; CHECK-LABEL: fun2:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    stmg %r13, %r15, 104(%r15)
-; CHECK-NEXT:    .cfi_offset %r13, -56
-; CHECK-NEXT:    .cfi_offset %r14, -48
-; CHECK-NEXT:    .cfi_offset %r15, -40
-; CHECK-NEXT:    aghi %r15, -176
-; CHECK-NEXT:    .cfi_def_cfa_offset 336
-; CHECK-NEXT:    lgr %r13, %r2
-; CHECK-NEXT:    la %r4, 160(%r15)
-; CHECK-NEXT:    lghi %r2, 16
-; CHECK-NEXT:    lhi %r5, 5
-; CHECK-NEXT:    brasl %r14, __atomic_load@PLT
-; CHECK-NEXT:    ld %f0, 160(%r15)
-; CHECK-NEXT:    ld %f2, 168(%r15)
-; CHECK-NEXT:    std %f0, 0(%r13)
-; CHECK-NEXT:    std %f2, 8(%r13)
-; CHECK-NEXT:    lmg %r13, %r15, 280(%r15)
-; CHECK-NEXT:    br %r14
-;
-; Z14-LABEL: fun2:
-; Z14:       # %bb.0:
-; Z14-NEXT:    stmg %r13, %r15, 104(%r15)
-; Z14-NEXT:    .cfi_offset %r13, -56
-; Z14-NEXT:    .cfi_offset %r14, -48
-; Z14-NEXT:    .cfi_offset %r15, -40
-; Z14-NEXT:    aghi %r15, -176
-; Z14-NEXT:    .cfi_def_cfa_offset 336
-; Z14-NEXT:    lgr %r13, %r2
-; Z14-NEXT:    la %r4, 160(%r15)
-; Z14-NEXT:    lghi %r2, 16
-; Z14-NEXT:    lhi %r5, 5
-; Z14-NEXT:    brasl %r14, __atomic_load@PLT
-; Z14-NEXT:    vl %v0, 160(%r15), 3
-; Z14-NEXT:    vst %v0, 0(%r13), 3
-; Z14-NEXT:    lmg %r13, %r15, 280(%r15)
-; Z14-NEXT:    br %r14
-  %val = load atomic fp128, ptr %src seq_cst, align 8
-  store fp128 %val, ptr %ret, align 8
-  ret void
-}