From ebb1605bf3e3cfbe5d80499c8467aebc02ba9690 Mon Sep 17 00:00:00 2001 From: Jonas Paulsson <paulsson@linux.vnet.ibm.com> Date: Mon, 7 May 2018 10:48:43 +0000 Subject: [PATCH] [SystemZ] Bugfix for MVCLoop CC clobbering. MVCLoop clobbers CC (since it emits a compare/branch), but this was not modelled. Review: Ulrich Weigand llvm-svn: 331627 --- .../lib/Target/SystemZ/SystemZInstrFormats.td | 2 +- llvm/test/CodeGen/SystemZ/cc-liveness.ll | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 llvm/test/CodeGen/SystemZ/cc-liveness.ll diff --git a/llvm/lib/Target/SystemZ/SystemZInstrFormats.td b/llvm/lib/Target/SystemZ/SystemZInstrFormats.td index 4e7d665ae9ee..e3f9a9645d13 100644 --- a/llvm/lib/Target/SystemZ/SystemZInstrFormats.td +++ b/llvm/lib/Target/SystemZ/SystemZInstrFormats.td @@ -4779,7 +4779,7 @@ class AtomicLoadWBinaryImm<SDPatternOperator operator, Immediate imm> multiclass MemorySS<string mnemonic, bits<8> opcode, SDPatternOperator sequence, SDPatternOperator loop> { def "" : SideEffectBinarySSa<mnemonic, opcode>; - let usesCustomInserter = 1, hasNoSchedulingInfo = 1 in { + let usesCustomInserter = 1, hasNoSchedulingInfo = 1, Defs = [CC] in { def Sequence : Pseudo<(outs), (ins bdaddr12only:$dest, bdaddr12only:$src, imm64:$length), [(sequence bdaddr12only:$dest, bdaddr12only:$src, diff --git a/llvm/test/CodeGen/SystemZ/cc-liveness.ll b/llvm/test/CodeGen/SystemZ/cc-liveness.ll new file mode 100644 index 000000000000..e4cbb15ea6e7 --- /dev/null +++ b/llvm/test/CodeGen/SystemZ/cc-liveness.ll @@ -0,0 +1,34 @@ +; Check that the MVCLoop (memcpy) is marked as clobbering CC, so that it will +; not be placed betwen two compare and load-on-condition instructions. +; +; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 -pre-RA-sched=list-ilp \ +; RUN: -print-after=expand-isel-pseudos 2>&1 | FileCheck %s +; +; CHECK-LABEL: bb.0.bb: +; CHECK: CLI +; CHECK: LOCGHI +; CHECK-LABEL: bb.2.bb: +; CHECK: MVC + +@.str.35 = external dso_local unnamed_addr constant [9 x i8], align 2 +@func_38.l_1854 = external dso_local unnamed_addr constant [7 x [10 x [3 x i64**]]], align 8 + +; Function Attrs: nounwind +define dso_local signext i32 @main(i32 signext %arg, i8** nocapture readonly %arg1) local_unnamed_addr #0 { +bb: + %tmp = load i8, i8* undef, align 1 + %tmp2 = zext i8 %tmp to i32 + %tmp3 = sub nsw i32 0, %tmp2 + %tmp4 = icmp eq i32 %tmp3, 0 + %tmp5 = zext i1 %tmp4 to i32 + call void @llvm.memcpy.p0i8.p0i8.i64(i8* nonnull align 8 undef, i8* align 8 bitcast ([7 x [10 x [3 x i64**]]]* @func_38.l_1854 to i8*), i64 1680, i1 false) #2 + call fastcc void @transparent_crc(i64 undef, i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str.35, i64 0, i64 0), i32 signext %tmp5) + unreachable +} + +; Function Attrs: nounwind +declare dso_local fastcc void @transparent_crc(i64, i8*, i32 signext) unnamed_addr #0 + +; Function Attrs: argmemonly nounwind +declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture writeonly, i8* nocapture readonly, i64, i1) #1 +