This is an archive of the discontinued LLVM Phabricator instance.

Differential D48550

[PowerPC] Fix incorrectly encoded wait instruction
ClosedPublic

Authored by lei on Jun 25 2018, 9:04 AM.

Details

Reviewers
sfertile
kbarton
nemanjai
hfinkel
Commits
rG5d109ee3d4a9: [PowerPC] Fix incorrectly encoded wait instruction
rL335514: [PowerPC] Fix incorrectly encoded wait instruction
Summary

Encoding for the wait instruction was wrong. Fix according to ISA 3.0.

Diff Detail

Repository
rL LLVM

Event Timeline

lei created this revision.Jun 25 2018, 9:04 AM
kbarton accepted this revision.Jun 25 2018, 11:59 AM

LGTM.

This revision is now accepted and ready to land.Jun 25 2018, 11:59 AM
Closed by commit rL335514: [PowerPC] Fix incorrectly encoded wait instruction (authored by lei). · Explain WhyJun 25 2018, 12:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Target/
PowerPC/
2 lines
test/
MC/
Disassembler/
PowerPC/
8 lines
PowerPC/
16 lines

Diff 152750

llvm/trunk/lib/Target/PowerPC/PPCInstrInfo.td

Show First 20 Lines • Show All 3,801 Lines • ▼ Show 20 Lines
def ICBI : XForm_1a<31, 982, (outs), (ins memrr:$src), def ICBI : XForm_1a<31, 982, (outs), (ins memrr:$src),
"icbi $src", IIC_LdStICBI, []>; "icbi $src", IIC_LdStICBI, []>;
// We used to have EIEIO as value but E[0-9A-Z] is a reserved name // We used to have EIEIO as value but E[0-9A-Z] is a reserved name
def EnforceIEIO : XForm_24_eieio<31, 854, (outs), (ins), def EnforceIEIO : XForm_24_eieio<31, 854, (outs), (ins),
"eieio", IIC_LdStLoad, []>; "eieio", IIC_LdStLoad, []>;
def WAIT : XForm_24_sync<31, 62, (outs), (ins i32imm:$L), def WAIT : XForm_24_sync<31, 30, (outs), (ins i32imm:$L),
"wait $L", IIC_LdStLoad, []>; "wait $L", IIC_LdStLoad, []>;
def MBAR : XForm_mbar<31, 854, (outs), (ins u5imm:$MO), def MBAR : XForm_mbar<31, 854, (outs), (ins u5imm:$MO),
"mbar $MO", IIC_LdStLoad>, Requires<[IsBookE]>; "mbar $MO", IIC_LdStLoad>, Requires<[IsBookE]>;
def MTSR: XForm_sr<31, 210, (outs), (ins gprc:$RS, u4imm:$SR), def MTSR: XForm_sr<31, 210, (outs), (ins gprc:$RS, u4imm:$SR),
"mtsr $SR, $RS", IIC_SprMTSR>; "mtsr $SR, $RS", IIC_SprMTSR>;
▲ Show 20 Lines • Show All 962 Lines • Show Last 20 Lines

llvm/trunk/test/MC/Disassembler/PowerPC/ppc64-encoding-bookII.txt

Show All 40 Lines
# CHECK: ptesync # CHECK: ptesync
0x7c 0x40 0x04 0xac 0x7c 0x40 0x04 0xac
# CHECK: eieio # CHECK: eieio
0x7c 0x00 0x06 0xac 0x7c 0x00 0x06 0xac
# CHECK: waitimpl # CHECK: waitimpl
0x7c 0x40 0x00 0x7c 0x7c 0x40 0x00 0x3c
# CHECK: mbar 1 # CHECK: mbar 1
0x7c 0x20 0x06 0xac 0x7c 0x20 0x06 0xac
# CHECK: dcbf 2, 3 # CHECK: dcbf 2, 3
0x7c 0x02 0x18 0xac 0x7c 0x02 0x18 0xac
# CHECK: dcbfl 2, 3 # CHECK: dcbfl 2, 3
Show All 40 Lines
# CHECK: lwsync # CHECK: lwsync
0x7c 0x20 0x04 0xac 0x7c 0x20 0x04 0xac
# CHECK: ptesync # CHECK: ptesync
0x7c 0x40 0x04 0xac 0x7c 0x40 0x04 0xac
# CHECK: wait # CHECK: wait
0x7c 0x00 0x00 0x7c 0x7c 0x00 0x00 0x3c
# CHECK: waitrsv # CHECK: waitrsv
0x7c 0x20 0x00 0x7c 0x7c 0x20 0x00 0x3c
# CHECK: waitimpl # CHECK: waitimpl
0x7c 0x40 0x00 0x7c 0x7c 0x40 0x00 0x3c
# CHECK: mftb 2, 123 # CHECK: mftb 2, 123
0x7c 0x5b 0x1a 0xe6 0x7c 0x5b 0x1a 0xe6
# CHECK: mftb 2, 268 # CHECK: mftb 2, 268
0x7c 0x4c 0x42 0xe6 0x7c 0x4c 0x42 0xe6
# CHECK: mftbu 2 # CHECK: mftbu 2
0x7c 0x4d 0x42 0xe6 0x7c 0x4d 0x42 0xe6

llvm/trunk/test/MC/PowerPC/ppc64-encoding-bookII.s

Show First 20 Lines • Show All 91 Lines • ▼ Show 20 Lines# CHECK-LE: stdat 2, 3, 28 # encoding: [0xcc,0xe5,0x43,0x7c]
stdat 2, 3, 28 stdat 2, 3, 28
# CHECK-BE: ptesync # encoding: [0x7c,0x40,0x04,0xac] # CHECK-BE: ptesync # encoding: [0x7c,0x40,0x04,0xac]
# CHECK-LE: ptesync # encoding: [0xac,0x04,0x40,0x7c] # CHECK-LE: ptesync # encoding: [0xac,0x04,0x40,0x7c]
sync 2 sync 2
# CHECK-BE: eieio # encoding: [0x7c,0x00,0x06,0xac] # CHECK-BE: eieio # encoding: [0x7c,0x00,0x06,0xac]
# CHECK-LE: eieio # encoding: [0xac,0x06,0x00,0x7c] # CHECK-LE: eieio # encoding: [0xac,0x06,0x00,0x7c]
eieio eieio
# CHECK-BE: waitimpl # encoding: [0x7c,0x40,0x00,0x7c] # CHECK-BE: waitimpl # encoding: [0x7c,0x40,0x00,0x3c]
# CHECK-LE: waitimpl # encoding: [0x7c,0x00,0x40,0x7c] # CHECK-LE: waitimpl # encoding: [0x3c,0x00,0x40,0x7c]
wait 2 wait 2
# CHECK-BE: mbar 1 # encoding: [0x7c,0x20,0x06,0xac] # CHECK-BE: mbar 1 # encoding: [0x7c,0x20,0x06,0xac]
# CHECK-LE: mbar 1 # encoding: [0xac,0x06,0x20,0x7c] # CHECK-LE: mbar 1 # encoding: [0xac,0x06,0x20,0x7c]
mbar 1 mbar 1
# CHECK-BE: mbar # encoding: [0x7c,0x00,0x06,0xac] # CHECK-BE: mbar # encoding: [0x7c,0x00,0x06,0xac]
mbar mbar
# Extended mnemonics # Extended mnemonics
▲ Show 20 Lines • Show All 56 Lines • ▼ Show 20 Lines# CHECK-LE: sync # encoding: [0xac,0x04,0x00,0x7c]
msync msync
# CHECK-BE: lwsync # encoding: [0x7c,0x20,0x04,0xac] # CHECK-BE: lwsync # encoding: [0x7c,0x20,0x04,0xac]
# CHECK-LE: lwsync # encoding: [0xac,0x04,0x20,0x7c] # CHECK-LE: lwsync # encoding: [0xac,0x04,0x20,0x7c]
lwsync lwsync
# CHECK-BE: ptesync # encoding: [0x7c,0x40,0x04,0xac] # CHECK-BE: ptesync # encoding: [0x7c,0x40,0x04,0xac]
# CHECK-LE: ptesync # encoding: [0xac,0x04,0x40,0x7c] # CHECK-LE: ptesync # encoding: [0xac,0x04,0x40,0x7c]
ptesync ptesync
# CHECK-BE: wait # encoding: [0x7c,0x00,0x00,0x7c] # CHECK-BE: wait # encoding: [0x7c,0x00,0x00,0x3c]
# CHECK-LE: wait # encoding: [0x7c,0x00,0x00,0x7c] # CHECK-LE: wait # encoding: [0x3c,0x00,0x00,0x7c]
wait wait
# CHECK-BE: waitrsv # encoding: [0x7c,0x20,0x00,0x7c] # CHECK-BE: waitrsv # encoding: [0x7c,0x20,0x00,0x3c]
# CHECK-LE: waitrsv # encoding: [0x7c,0x00,0x20,0x7c] # CHECK-LE: waitrsv # encoding: [0x3c,0x00,0x20,0x7c]
waitrsv waitrsv
# CHECK-BE: waitimpl # encoding: [0x7c,0x40,0x00,0x7c] # CHECK-BE: waitimpl # encoding: [0x7c,0x40,0x00,0x3c]
# CHECK-LE: waitimpl # encoding: [0x7c,0x00,0x40,0x7c] # CHECK-LE: waitimpl # encoding: [0x3c,0x00,0x40,0x7c]
waitimpl waitimpl
# Time base instructions # Time base instructions
# CHECK-BE: mftb 2, 123 # encoding: [0x7c,0x5b,0x1a,0xe6] # CHECK-BE: mftb 2, 123 # encoding: [0x7c,0x5b,0x1a,0xe6]
# CHECK-LE: mftb 2, 123 # encoding: [0xe6,0x1a,0x5b,0x7c] # CHECK-LE: mftb 2, 123 # encoding: [0xe6,0x1a,0x5b,0x7c]
mftb 2, 123 mftb 2, 123
# CHECK-BE: mftb 2, 268 # encoding: [0x7c,0x4c,0x42,0xe6] # CHECK-BE: mftb 2, 268 # encoding: [0x7c,0x4c,0x42,0xe6]
Show All 15 Lines