diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2008-09-29 17:26:18 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2008-09-29 17:26:18 +0000 |
| commit | d47e0b664f9c4546e26cc527deca145fe37634fa (patch) | |
| tree | 9743f0f752c89b8e42f883545e4dbc363f620e64 | |
| parent | 6cccf03d02936e16319e7cebf7a158643a8b1040 (diff) | |
| download | external_llvm-d47e0b664f9c4546e26cc527deca145fe37634fa.zip external_llvm-d47e0b664f9c4546e26cc527deca145fe37634fa.tar.gz external_llvm-d47e0b664f9c4546e26cc527deca145fe37634fa.tar.bz2 | |
Fix PR2835. Do not change the width of a volatile load.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56792 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.td | 20 | ||||
| -rw-r--r-- | test/CodeGen/X86/2008-09-29-VolatileBug.ll | 15 |
2 files changed, 33 insertions, 2 deletions
diff --git a/lib/Target/X86/X86InstrInfo.td b/lib/Target/X86/X86InstrInfo.td index 11ea1c0..ee60b9f 100644 --- a/lib/Target/X86/X86InstrInfo.td +++ b/lib/Target/X86/X86InstrInfo.td @@ -266,6 +266,20 @@ def loadi32 : PatFrag<(ops node:$ptr), (i32 (ld node:$ptr)), [{ return false; }]>; +def nvloadi32 : PatFrag<(ops node:$ptr), (i32 (ld node:$ptr)), [{ + LoadSDNode *LD = cast<LoadSDNode>(N); + if (LD->isVolatile()) + return false; + if (LD->getAddressingMode() != ISD::UNINDEXED) + return false; + ISD::LoadExtType ExtType = LD->getExtensionType(); + if (ExtType == ISD::NON_EXTLOAD) + return true; + if (ExtType == ISD::EXTLOAD) + return LD->getAlignment() >= 4; + return false; +}]>; + def loadi8 : PatFrag<(ops node:$ptr), (i8 (load node:$ptr))>; def loadi64 : PatFrag<(ops node:$ptr), (i64 (load node:$ptr))>; @@ -2812,8 +2826,10 @@ def : Pat<(i32 (anyext GR16:$src)), (INSERT_SUBREG (i32 (IMPLICIT_DEF)), GR16:$src, x86_subreg_16bit)>; // (and (i32 load), 255) -> (zextload i8) -def : Pat<(i32 (and (loadi32 addr:$src), (i32 255))), (MOVZX32rm8 addr:$src)>; -def : Pat<(i32 (and (loadi32 addr:$src), (i32 65535))),(MOVZX32rm16 addr:$src)>; +def : Pat<(i32 (and (nvloadi32 addr:$src), (i32 255))), + (MOVZX32rm8 addr:$src)>; +def : Pat<(i32 (and (nvloadi32 addr:$src), (i32 65535))), + (MOVZX32rm16 addr:$src)>; //===----------------------------------------------------------------------===// // Some peepholes diff --git a/test/CodeGen/X86/2008-09-29-VolatileBug.ll b/test/CodeGen/X86/2008-09-29-VolatileBug.ll new file mode 100644 index 0000000..4f6eb59 --- /dev/null +++ b/test/CodeGen/X86/2008-09-29-VolatileBug.ll @@ -0,0 +1,15 @@ +; RUN: llvm-as < %s | llc -march=x86 | not grep movz +; PR2835 + +@g_407 = internal global i32 0 ; <i32*> [#uses=1] +@llvm.used = appending global [1 x i8*] [ i8* bitcast (i32 ()* @main to i8*) ], section "llvm.metadata" ; <[1 x i8*]*> [#uses=0] + +define i32 @main() nounwind { +entry: + %0 = volatile load i32* @g_407, align 4 ; <i32> [#uses=1] + %1 = trunc i32 %0 to i8 ; <i8> [#uses=1] + %2 = tail call i32 @func_45(i8 zeroext %1) nounwind ; <i32> [#uses=0] + ret i32 0 +} + +declare i32 @func_45(i8 zeroext) nounwind |