This is an archive of the discontinued LLVM Phabricator instance.

Differential D6440

[mips][microMIPS] Implement NOP aliases
ClosedPublic

Authored by jkolek on Nov 27 2014, 9:20 AM.

Details

Reviewers
sstankovic
dsanders
vmedic
Summary

This patch implements microMIPS 16-bit (MOVE16 $0, $0) and 32-bit (SLL $0, $0, 0) NOP aliases.

Diff Detail

Event Timeline

jkolek updated this revision to Diff 16699.Nov 27 2014, 9:20 AM
jkolek retitled this revision from to [mips][microMIPS] Implement NOP aliases.
jkolek updated this object.
jkolek edited the test plan for this revision. (Show Details)
jkolek added reviewers: dsanders, sstankovic, vmedic.
jkolek added subscribers: Unknown Object (MLST), zoran.jovanovic.
jkolek updated this revision to Diff 16744.Nov 28 2014, 11:02 AM
sstankovic edited edge metadata.Nov 28 2014, 1:52 PM

LGTM

sstankovic accepted this revision.Nov 28 2014, 1:52 PM
sstankovic edited edge metadata.
This revision is now accepted and ready to land.Nov 28 2014, 1:52 PM
jkolek closed this revision.Nov 29 2014, 5:31 AM

Committed revision 222953.

Revision Contents

PathSize
lib/
Target/
Mips/
MCTargetDesc/
3 lines
2 lines
test/
MC/
Disassembler/
Mips/
6 lines
6 lines
Mips/
4 lines
8 lines
8 lines

Diff 16744

lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp

Show First 20 Lines • Show All 167 Lines • ▼ Show 20 LinesEncodeInstruction(const MCInst &MI, raw_ostream &OS,
unsigned long N = Fixups.size(); unsigned long N = Fixups.size();
uint32_t Binary = getBinaryCodeForInstr(TmpInst, Fixups, STI); uint32_t Binary = getBinaryCodeForInstr(TmpInst, Fixups, STI);
// Check for unimplemented opcodes. // Check for unimplemented opcodes.
// Unfortunately in MIPS both NOP and SLL will come in with Binary == 0 // Unfortunately in MIPS both NOP and SLL will come in with Binary == 0
// so we have to special check for them. // so we have to special check for them.
unsigned Opcode = TmpInst.getOpcode(); unsigned Opcode = TmpInst.getOpcode();
if ((Opcode != Mips::NOP) && (Opcode != Mips::SLL) && !Binary) if ((Opcode != Mips::NOP) && (Opcode != Mips::SLL) &&
(Opcode != Mips::SLL_MM) && !Binary)
llvm_unreachable("unimplemented opcode in EncodeInstruction()"); llvm_unreachable("unimplemented opcode in EncodeInstruction()");
if (STI.getFeatureBits() & Mips::FeatureMicroMips) { if (STI.getFeatureBits() & Mips::FeatureMicroMips) {
int NewOpcode = Mips::Std2MicroMips (Opcode, Mips::Arch_micromips); int NewOpcode = Mips::Std2MicroMips (Opcode, Mips::Arch_micromips);
if (NewOpcode != -1) { if (NewOpcode != -1) {
if (Fixups.size() > N) if (Fixups.size() > N)
Fixups.pop_back(); Fixups.pop_back();
Opcode = NewOpcode; Opcode = NewOpcode;
▲ Show 20 Lines • Show All 663 Lines • Show Last 20 Lines

lib/Target/Mips/MicroMipsInstrInfo.td

Show First 20 Lines • Show All 691 Lines • ▼ Show 20 Lines
def : MipsPat<(srl GPR32:$src, immZExt5:$imm), def : MipsPat<(srl GPR32:$src, immZExt5:$imm),
(SRL_MM GPR32:$src, immZExt5:$imm)>; (SRL_MM GPR32:$src, immZExt5:$imm)>;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// MicroMips instruction aliases // MicroMips instruction aliases
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
def : MipsInstAlias<"wait", (WAIT_MM 0x0), 1>; def : MipsInstAlias<"wait", (WAIT_MM 0x0), 1>;
def : MipsInstAlias<"nop", (SLL_MM ZERO, ZERO, 0), 1>;
def : MipsInstAlias<"nop", (MOVE16_MM ZERO, ZERO), 1>;
} }

test/MC/Disassembler/Mips/micromips.txt

Show First 20 Lines • Show All 325 Lines • ▼ Show 20 Lines
0x03 0xe6 0x4f 0x3c 0x03 0xe6 0x4f 0x3c
# CHECK: lwm32 $16, $17, 8($4) # CHECK: lwm32 $16, $17, 8($4)
0x20 0x44 0x50 0x08 0x20 0x44 0x50 0x08
# CHECK: swm32 $16, $17, 8($4) # CHECK: swm32 $16, $17, 8($4)
0x20 0x44 0xd0 0x08 0x20 0x44 0xd0 0x08
# CHECK: nop
0x00 0x00 0x00 0x00
# CHECK: addu16 $6, $17, $4 # CHECK: addu16 $6, $17, $4
0x07 0x42 0x07 0x42
# CHECK: subu16 $5, $16, $3 # CHECK: subu16 $5, $16, $3
0x06 0xb1 0x06 0xb1
# CHECK: and16 $16, $2 # CHECK: and16 $16, $2
0x44 0x82 0x44 0x82
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
# CHECK: addiur2 $6, $7, -1 # CHECK: addiur2 $6, $7, -1
0x6f 0x7e 0x6f 0x7e
# CHECK: addiur2 $6, $7, 12 # CHECK: addiur2 $6, $7, 12
0x6f 0x76 0x6f 0x76
# CHECK: addius5 $7, -2 # CHECK: addius5 $7, -2
0x4c 0xfc 0x4c 0xfc
# CHECK: nop
0x0c 0x00

test/MC/Disassembler/Mips/micromips_le.txt

Show First 20 Lines • Show All 325 Lines • ▼ Show 20 Lines
0xe6 0x03 0x3c 0x4f 0xe6 0x03 0x3c 0x4f
# CHECK: lwm32 $16, $17, 8($4) # CHECK: lwm32 $16, $17, 8($4)
0x44 0x20 0x08 0x50 0x44 0x20 0x08 0x50
# CHECK: swm32 $16, $17, 8($4) # CHECK: swm32 $16, $17, 8($4)
0x44 0x20 0x08 0xd0 0x44 0x20 0x08 0xd0
# CHECK: nop
0x00 0x00 0x00 0x00
# CHECK: addu16 $6, $17, $4 # CHECK: addu16 $6, $17, $4
0x42 0x07 0x42 0x07
# CHECK: subu16 $5, $16, $3 # CHECK: subu16 $5, $16, $3
0xb1 0x06 0xb1 0x06
# CHECK: and16 $16, $2 # CHECK: and16 $16, $2
0x82 0x44 0x82 0x44
▲ Show 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
# CHECK: addiur2 $6, $7, -1 # CHECK: addiur2 $6, $7, -1
0x7e 0x6f 0x7e 0x6f
# CHECK: addiur2 $6, $7, 12 # CHECK: addiur2 $6, $7, 12
0x76 0x6f 0x76 0x6f
# CHECK: addius5 $7, -2 # CHECK: addius5 $7, -2
0xfc 0x4c 0xfc 0x4c
# CHECK: nop
0x00 0x0c

test/MC/Mips/micromips-16-bit-instructions.s

Show All 36 Lines
# CHECK-EL: mfhi $9 # encoding: [0x09,0x46] # CHECK-EL: mfhi $9 # encoding: [0x09,0x46]
# CHECK-EL: mflo $9 # encoding: [0x49,0x46] # CHECK-EL: mflo $9 # encoding: [0x49,0x46]
# CHECK-EL: move $25, $1 # encoding: [0x21,0x0f] # CHECK-EL: move $25, $1 # encoding: [0x21,0x0f]
# CHECK-EL: jrc $9 # encoding: [0xa9,0x45] # CHECK-EL: jrc $9 # encoding: [0xa9,0x45]
# CHECK-NEXT: jalr $9 # encoding: [0xc9,0x45] # CHECK-NEXT: jalr $9 # encoding: [0xc9,0x45]
# CHECK-EL: jraddiusp 20 # encoding: [0x05,0x47] # CHECK-EL: jraddiusp 20 # encoding: [0x05,0x47]
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: jalrs16 $9 # encoding: [0xe9,0x45] # CHECK-EL: jalrs16 $9 # encoding: [0xe9,0x45]
# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] # CHECK-EL: nop # encoding: [0x00,0x0c]
# CHECK-EL: jr16 $9 # encoding: [0x89,0x45] # CHECK-EL: jr16 $9 # encoding: [0x89,0x45]
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Big endian # Big endian
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# CHECK-EB: addu16 $6, $17, $4 # encoding: [0x07,0x42] # CHECK-EB: addu16 $6, $17, $4 # encoding: [0x07,0x42]
# CHECK-EB: subu16 $5, $16, $3 # encoding: [0x06,0xb1] # CHECK-EB: subu16 $5, $16, $3 # encoding: [0x06,0xb1]
# CHECK-EB: andi16 $16, $2, 31 # encoding: [0x2c,0x29] # CHECK-EB: andi16 $16, $2, 31 # encoding: [0x2c,0x29]
Show All 22 Lines
# CHECK-EB: mfhi $9 # encoding: [0x46,0x09] # CHECK-EB: mfhi $9 # encoding: [0x46,0x09]
# CHECK-EB: mflo $9 # encoding: [0x46,0x49] # CHECK-EB: mflo $9 # encoding: [0x46,0x49]
# CHECK-EB: move $25, $1 # encoding: [0x0f,0x21] # CHECK-EB: move $25, $1 # encoding: [0x0f,0x21]
# CHECK-EB: jrc $9 # encoding: [0x45,0xa9] # CHECK-EB: jrc $9 # encoding: [0x45,0xa9]
# CHECK-NEXT: jalr $9 # encoding: [0x45,0xc9] # CHECK-NEXT: jalr $9 # encoding: [0x45,0xc9]
# CHECK-EB: jraddiusp 20 # encoding: [0x47,0x05] # CHECK-EB: jraddiusp 20 # encoding: [0x47,0x05]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: jalrs16 $9 # encoding: [0x45,0xe9] # CHECK-EB: jalrs16 $9 # encoding: [0x45,0xe9]
# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] # CHECK-EB: nop # encoding: [0x0c,0x00]
# CHECK-EB: jr16 $9 # encoding: [0x45,0x89] # CHECK-EB: jr16 $9 # encoding: [0x45,0x89]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
addu16 $6, $17, $4 addu16 $6, $17, $4
subu16 $5, $16, $3 subu16 $5, $16, $3
andi16 $16, $2, 31 andi16 $16, $2, 31
and16 $16, $2 and16 $16, $2
not16 $17, $3 not16 $17, $3
Show All 28 Lines

test/MC/Mips/micromips-branch-instructions.s

Show All 24 Lines
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: bne $9, $6, 1332 # encoding: [0xc9,0xb4,0x9a,0x02] # CHECK-EL: bne $9, $6, 1332 # encoding: [0xc9,0xb4,0x9a,0x02]
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: bal 1332 # encoding: [0x60,0x40,0x9a,0x02] # CHECK-EL: bal 1332 # encoding: [0x60,0x40,0x9a,0x02]
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: bltz $6, 1332 # encoding: [0x06,0x40,0x9a,0x02] # CHECK-EL: bltz $6, 1332 # encoding: [0x06,0x40,0x9a,0x02]
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: bgezals $6, 1332 # encoding: [0x66,0x42,0x9a,0x02] # CHECK-EL: bgezals $6, 1332 # encoding: [0x66,0x42,0x9a,0x02]
# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] # CHECK-EL: nop # encoding: [0x00,0x0c]
# CHECK-EL: bltzals $6, 1332 # encoding: [0x26,0x42,0x9a,0x02] # CHECK-EL: bltzals $6, 1332 # encoding: [0x26,0x42,0x9a,0x02]
# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] # CHECK-EL: nop # encoding: [0x00,0x0c]
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Big endian # Big endian
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# CHECK-EB: b 1332 # encoding: [0x94,0x00,0x02,0x9a] # CHECK-EB: b 1332 # encoding: [0x94,0x00,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: beq $9, $6, 1332 # encoding: [0x94,0xc9,0x02,0x9a] # CHECK-EB: beq $9, $6, 1332 # encoding: [0x94,0xc9,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: bgez $6, 1332 # encoding: [0x40,0x46,0x02,0x9a] # CHECK-EB: bgez $6, 1332 # encoding: [0x40,0x46,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: bgezal $6, 1332 # encoding: [0x40,0x66,0x02,0x9a] # CHECK-EB: bgezal $6, 1332 # encoding: [0x40,0x66,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: bltzal $6, 1332 # encoding: [0x40,0x26,0x02,0x9a] # CHECK-EB: bltzal $6, 1332 # encoding: [0x40,0x26,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: bgtz $6, 1332 # encoding: [0x40,0xc6,0x02,0x9a] # CHECK-EB: bgtz $6, 1332 # encoding: [0x40,0xc6,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: blez $6, 1332 # encoding: [0x40,0x86,0x02,0x9a] # CHECK-EB: blez $6, 1332 # encoding: [0x40,0x86,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: bne $9, $6, 1332 # encoding: [0xb4,0xc9,0x02,0x9a] # CHECK-EB: bne $9, $6, 1332 # encoding: [0xb4,0xc9,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: bal 1332 # encoding: [0x40,0x60,0x02,0x9a] # CHECK-EB: bal 1332 # encoding: [0x40,0x60,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: bltz $6, 1332 # encoding: [0x40,0x06,0x02,0x9a] # CHECK-EB: bltz $6, 1332 # encoding: [0x40,0x06,0x02,0x9a]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: bgezals $6, 1332 # encoding: [0x42,0x66,0x02,0x9a] # CHECK-EB: bgezals $6, 1332 # encoding: [0x42,0x66,0x02,0x9a]
# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] # CHECK-EB: nop # encoding: [0x0c,0x00]
# CHECK-EB: bltzals $6, 1332 # encoding: [0x42,0x26,0x02,0x9a] # CHECK-EB: bltzals $6, 1332 # encoding: [0x42,0x26,0x02,0x9a]
# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] # CHECK-EB: nop # encoding: [0x0c,0x00]
b 1332 b 1332
beq $9,$6,1332 beq $9,$6,1332
bgez $6,1332 bgez $6,1332
bgezal $6,1332 bgezal $6,1332
bltzal $6,1332 bltzal $6,1332
bgtz $6,1332 bgtz $6,1332
blez $6,1332 blez $6,1332
bne $9,$6,1332 bne $9,$6,1332
bal 1332 bal 1332
bltz $6,1332 bltz $6,1332
bgezals $6,1332 bgezals $6,1332
bltzals $6,1332 bltzals $6,1332

test/MC/Mips/micromips-jump-instructions.s

Show All 14 Lines
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: jalr $ra, $6 # encoding: [0xe6,0x03,0x3c,0x0f] # CHECK-EL: jalr $ra, $6 # encoding: [0xe6,0x03,0x3c,0x0f]
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: jr $7 # encoding: [0x07,0x00,0x3c,0x0f] # CHECK-EL: jr $7 # encoding: [0x07,0x00,0x3c,0x0f]
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: jr $7 # encoding: [0x07,0x00,0x3c,0x0f] # CHECK-EL: jr $7 # encoding: [0x07,0x00,0x3c,0x0f]
# CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EL: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EL: jals 1328 # encoding: [0x00,0x74,0x98,0x02] # CHECK-EL: jals 1328 # encoding: [0x00,0x74,0x98,0x02]
# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] # CHECK-EL: nop # encoding: [0x00,0x0c]
# CHECK-EL: jalrs $ra, $6 # encoding: [0xe6,0x03,0x3c,0x4f] # CHECK-EL: jalrs $ra, $6 # encoding: [0xe6,0x03,0x3c,0x4f]
# CHECK-EL: move $zero, $zero # encoding: [0x00,0x0c] # CHECK-EL: nop # encoding: [0x00,0x0c]
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Big endian # Big endian
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# CHECK-EB: j 1328 # encoding: [0xd4,0x00,0x02,0x98] # CHECK-EB: j 1328 # encoding: [0xd4,0x00,0x02,0x98]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: jal 1328 # encoding: [0xf4,0x00,0x02,0x98] # CHECK-EB: jal 1328 # encoding: [0xf4,0x00,0x02,0x98]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: jalr $ra, $6 # encoding: [0x03,0xe6,0x0f,0x3c] # CHECK-EB: jalr $ra, $6 # encoding: [0x03,0xe6,0x0f,0x3c]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: jr $7 # encoding: [0x00,0x07,0x0f,0x3c] # CHECK-EB: jr $7 # encoding: [0x00,0x07,0x0f,0x3c]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: jr $7 # encoding: [0x00,0x07,0x0f,0x3c] # CHECK-EB: jr $7 # encoding: [0x00,0x07,0x0f,0x3c]
# CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00] # CHECK-EB: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-EB: jals 1328 # encoding: [0x74,0x00,0x02,0x98] # CHECK-EB: jals 1328 # encoding: [0x74,0x00,0x02,0x98]
# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] # CHECK-EB: nop # encoding: [0x0c,0x00]
# CHECK-EB: jalrs $ra, $6 # encoding: [0x03,0xe6,0x4f,0x3c] # CHECK-EB: jalrs $ra, $6 # encoding: [0x03,0xe6,0x4f,0x3c]
# CHECK-EB: move $zero, $zero # encoding: [0x0c,0x00] # CHECK-EB: nop # encoding: [0x0c,0x00]
j 1328 j 1328
jal 1328 jal 1328
jalr $ra, $6 jalr $ra, $6
jr $7 jr $7
j $7 j $7
jals 1328 jals 1328
jalrs $ra, $6 jalrs $ra, $6