This is an archive of the discontinued LLVM Phabricator instance.

Differential D8969

[mips] [IAS] Do not generate redundant ORi in createLShiftOri.
ClosedPublic

Authored by tomatabacu on Apr 10 2015, 7:47 AM.

Details

Reviewers
dsanders
Commits
rG7dea2e39824e: [mips] [IAS] Do not generate redundant ORi in createLShiftOri.
rL235990: [mips] [IAS] Do not generate redundant ORi in createLShiftOri.
Summary

If the immediate is 0, the ORi is pointless.

Diff Detail

Event Timeline

tomatabacu updated this revision to Diff 23596.Apr 10 2015, 7:47 AM
tomatabacu retitled this revision from to [mips] [IAS] Do not generate redundant ORi in createLShiftOri..
tomatabacu updated this object.
tomatabacu edited the test plan for this revision. (Show Details)
tomatabacu added a reviewer: dsanders.
tomatabacu added a subscriber: Unknown Object (MLST).
tomatabacu added parent revisions: D8968: [mips] [IAS] Rename the createShiftOr function to createLShiftOri. NFC., D8924: [mips] [IAS] Store the expandLoadImm destination register in a variable. NFC..Apr 10 2015, 7:50 AM
tomatabacu mentioned this in D8607: [mips] [IAS] Improve support for the LI/DLI pseudo-instructions..Apr 10 2015, 8:29 AM
tomatabacu added a comment.Apr 27 2015, 2:00 AM

Ping.

dsanders accepted this revision.Apr 27 2015, 2:29 AM
dsanders edited edge metadata.

LGTM with a tiny nit

lib/Target/Mips/AsmParser/MipsAsmParser.cpp
1644

Tiny nit: Remove the comma

This revision is now accepted and ready to land.Apr 27 2015, 2:29 AM
tomatabacu closed this revision.Apr 28 2015, 7:09 AM

Revision Contents

PathSize
lib/
Target/
Mips/
AsmParser/
4 lines
test/
MC/
Mips/
13 lines
16 lines

Diff 23596

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

Show First 20 Lines • Show All 1,635 Lines • ▼ Show 20 Lines if (PerformShift) {
tmpInst.setOpcode(Mips::DSLL); tmpInst.setOpcode(Mips::DSLL);
tmpInst.addOperand(MCOperand::CreateReg(RegNo)); tmpInst.addOperand(MCOperand::CreateReg(RegNo));
tmpInst.addOperand(MCOperand::CreateReg(RegNo)); tmpInst.addOperand(MCOperand::CreateReg(RegNo));
tmpInst.addOperand(MCOperand::CreateImm(16)); tmpInst.addOperand(MCOperand::CreateImm(16));
tmpInst.setLoc(IDLoc); tmpInst.setLoc(IDLoc);
Instructions.push_back(tmpInst); Instructions.push_back(tmpInst);
tmpInst.clear(); tmpInst.clear();
} }
// There's no need for an ORi, if the immediate is 0.
dsandersUnsubmitted
Not Done
ReplyInline Actions

Tiny nit: Remove the comma

dsanders: Tiny nit: Remove the comma
if (Operand.isImm() && Operand.getImm() == 0)
return;
tmpInst.setOpcode(Mips::ORi); tmpInst.setOpcode(Mips::ORi);
tmpInst.addOperand(MCOperand::CreateReg(RegNo)); tmpInst.addOperand(MCOperand::CreateReg(RegNo));
tmpInst.addOperand(MCOperand::CreateReg(RegNo)); tmpInst.addOperand(MCOperand::CreateReg(RegNo));
tmpInst.addOperand(Operand); tmpInst.addOperand(Operand);
tmpInst.setLoc(IDLoc); tmpInst.setLoc(IDLoc);
Instructions.push_back(tmpInst); Instructions.push_back(tmpInst);
} }
▲ Show 20 Lines • Show All 2,811 Lines • Show Last 20 Lines

test/MC/Mips/mips-expansions.s

# RUN: llvm-mc %s -triple=mipsel-unknown-linux -show-encoding -mcpu=mips32r2 | FileCheck %s # RUN: llvm-mc %s -triple=mipsel-unknown-linux -show-encoding -mcpu=mips32r2 | FileCheck %s
# Check that the assembler can handle the documented syntax # Check that the assembler can handle the documented syntax
# for macro instructions # for macro instructions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Load immediate instructions # Load immediate instructions
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# CHECK: ori $5, $zero, 123 # encoding: [0x7b,0x00,0x05,0x34] # CHECK: ori $5, $zero, 123 # encoding: [0x7b,0x00,0x05,0x34]
# CHECK: addiu $6, $zero, -2345 # encoding: [0xd7,0xf6,0x06,0x24] # CHECK: addiu $6, $zero, -2345 # encoding: [0xd7,0xf6,0x06,0x24]
# CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] # CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c]
# CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] # CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34]
# CHECK: addiu $8, $zero, -8 # encoding: [0xf8,0xff,0x08,0x24] # CHECK: addiu $8, $zero, -8 # encoding: [0xf8,0xff,0x08,0x24]
# CHECK: lui $9, 1 # encoding: [0x01,0x00,0x09,0x3c]
# CHECK-NOT: ori $9, $9, 0 # encoding: [0x00,0x00,0x29,0x35]
# CHECK: addiu $4, $zero, 20 # encoding: [0x14,0x00,0x04,0x24] # CHECK: addiu $4, $zero, 20 # encoding: [0x14,0x00,0x04,0x24]
# CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] # CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c]
# CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] # CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34]
# CHECK: addiu $4, $5, 20 # encoding: [0x14,0x00,0xa4,0x24] # CHECK: addiu $4, $5, 20 # encoding: [0x14,0x00,0xa4,0x24]
# CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c] # CHECK: lui $7, 1 # encoding: [0x01,0x00,0x07,0x3c]
# CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34] # CHECK: ori $7, $7, 2 # encoding: [0x02,0x00,0xe7,0x34]
# CHECK: addu $7, $7, $8 # encoding: [0x21,0x38,0xe8,0x00] # CHECK: addu $7, $7, $8 # encoding: [0x21,0x38,0xe8,0x00]
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Lines
# CHECK: ldc1 $f0, %lo(symbol)($1) # CHECK: ldc1 $f0, %lo(symbol)($1)
# CHECK: lui $1, %hi(symbol) # CHECK: lui $1, %hi(symbol)
# CHECK: sdc1 $f0, %lo(symbol)($1) # CHECK: sdc1 $f0, %lo(symbol)($1)
li $5,123 li $5,123
li $6,-2345 li $6,-2345
li $7,65538 li $7,65538
li $8, ~7 li $8, ~7
li $9, 0x10000
la $a0, 20 la $a0, 20
la $7,65538 la $7,65538
la $a0, 20($a1) la $a0, 20($a1)
la $7,65538($8) la $7,65538($8)
la $t0, symbol la $t0, symbol
.set mips64 .set mips64
la $t0, symbol la $t0, symbol
Show All 15 Lines

test/MC/Mips/mips64-expansions.s

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
# CHECK: ori $12, $12, 42182 # encoding: [0xc6,0xa4,0x8c,0x35] # CHECK: ori $12, $12, 42182 # encoding: [0xc6,0xa4,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 32768 # encoding: [0x00,0x80,0x8c,0x35] # CHECK: ori $12, $12, 32768 # encoding: [0x00,0x80,0x8c,0x35]
# CHECK: lui $12, 35 # encoding: [0x23,0x00,0x0c,0x3c] # CHECK: lui $12, 35 # encoding: [0x23,0x00,0x0c,0x3c]
# CHECK: ori $12, $12, 34546 # encoding: [0xf2,0x86,0x8c,0x35] # CHECK: ori $12, $12, 34546 # encoding: [0xf2,0x86,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 28609 # encoding: [0xc1,0x6f,0x8c,0x35] # CHECK: ori $12, $12, 28609 # encoding: [0xc1,0x6f,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35] # CHECK-NOT: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35]
# CHECK: lui $12, 355 # encoding: [0x63,0x01,0x0c,0x3c] # CHECK: lui $12, 355 # encoding: [0x63,0x01,0x0c,0x3c]
# CHECK: ori $12, $12, 17784 # encoding: [0x78,0x45,0x8c,0x35] # CHECK: ori $12, $12, 17784 # encoding: [0x78,0x45,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 23946 # encoding: [0x8a,0x5d,0x8c,0x35] # CHECK: ori $12, $12, 23946 # encoding: [0x8a,0x5d,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35] # CHECK-NOT: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35]
# CHECK: lui $12, 3552 # encoding: [0xe0,0x0d,0x0c,0x3c] # CHECK: lui $12, 3552 # encoding: [0xe0,0x0d,0x0c,0x3c]
# CHECK: ori $12, $12, 46771 # encoding: [0xb3,0xb6,0x8c,0x35] # CHECK: ori $12, $12, 46771 # encoding: [0xb3,0xb6,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 42852 # encoding: [0x64,0xa7,0x8c,0x35] # CHECK: ori $12, $12, 42852 # encoding: [0x64,0xa7,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35] # CHECK-NOT: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35]
# CHECK: lui $12, 35527 # encoding: [0xc7,0x8a,0x0c,0x3c] # CHECK: lui $12, 35527 # encoding: [0xc7,0x8a,0x0c,0x3c]
# CHECK: ori $12, $12, 8964 # encoding: [0x04,0x23,0x8c,0x35] # CHECK: ori $12, $12, 8964 # encoding: [0x04,0x23,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 35304 # encoding: [0xe8,0x89,0x8c,0x35] # CHECK: ori $12, $12, 35304 # encoding: [0xe8,0x89,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35] # CHECK-NOT: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35]
# CHECK: addiu $12, $zero, -1 # encoding: [0xff,0xff,0x0c,0x24] # CHECK: addiu $12, $zero, -1 # encoding: [0xff,0xff,0x0c,0x24]
# CHECK: addiu $12, $zero, -10 # encoding: [0xf6,0xff,0x0c,0x24] # CHECK: addiu $12, $zero, -10 # encoding: [0xf6,0xff,0x0c,0x24]
# CHECK: addiu $12, $zero, -100 # encoding: [0x9c,0xff,0x0c,0x24] # CHECK: addiu $12, $zero, -100 # encoding: [0x9c,0xff,0x0c,0x24]
# CHECK: addiu $12, $zero, -1000 # encoding: [0x18,0xfc,0x0c,0x24] # CHECK: addiu $12, $zero, -1000 # encoding: [0x18,0xfc,0x0c,0x24]
# CHECK: addiu $12, $zero, -10000 # encoding: [0xf0,0xd8,0x0c,0x24] # CHECK: addiu $12, $zero, -10000 # encoding: [0xf0,0xd8,0x0c,0x24]
# CHECK: lui $12, 65535 # encoding: [0xff,0xff,0x0c,0x3c] # CHECK: lui $12, 65535 # encoding: [0xff,0xff,0x0c,0x3c]
# CHECK: ori $12, $12, 65535 # encoding: [0xff,0xff,0x8c,0x35] # CHECK: ori $12, $12, 65535 # encoding: [0xff,0xff,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
▲ Show 20 Lines • Show All 60 Lines • ▼ Show 20 Lines
# CHECK: ori $12, $12, 23353 # encoding: [0x39,0x5b,0x8c,0x35] # CHECK: ori $12, $12, 23353 # encoding: [0x39,0x5b,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 32768 # encoding: [0x00,0x80,0x8c,0x35] # CHECK: ori $12, $12, 32768 # encoding: [0x00,0x80,0x8c,0x35]
# CHECK: lui $12, 65500 # encoding: [0xdc,0xff,0x0c,0x3c] # CHECK: lui $12, 65500 # encoding: [0xdc,0xff,0x0c,0x3c]
# CHECK: ori $12, $12, 30989 # encoding: [0x0d,0x79,0x8c,0x35] # CHECK: ori $12, $12, 30989 # encoding: [0x0d,0x79,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 36927 # encoding: [0x3f,0x90,0x8c,0x35] # CHECK: ori $12, $12, 36927 # encoding: [0x3f,0x90,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35] # CHECK-NOT: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35]
# CHECK: lui $12, 65180 # encoding: [0x9c,0xfe,0x0c,0x3c] # CHECK: lui $12, 65180 # encoding: [0x9c,0xfe,0x0c,0x3c]
# CHECK: ori $12, $12, 47751 # encoding: [0x87,0xba,0x8c,0x35] # CHECK: ori $12, $12, 47751 # encoding: [0x87,0xba,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 41590 # encoding: [0x76,0xa2,0x8c,0x35] # CHECK: ori $12, $12, 41590 # encoding: [0x76,0xa2,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35] # CHECK-NOT: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35]
# CHECK: lui $12, 61983 # encoding: [0x1f,0xf2,0x0c,0x3c] # CHECK: lui $12, 61983 # encoding: [0x1f,0xf2,0x0c,0x3c]
# CHECK: ori $12, $12, 18764 # encoding: [0x4c,0x49,0x8c,0x35] # CHECK: ori $12, $12, 18764 # encoding: [0x4c,0x49,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 22684 # encoding: [0x9c,0x58,0x8c,0x35] # CHECK: ori $12, $12, 22684 # encoding: [0x9c,0x58,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35] # CHECK-NOT: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35]
# CHECK: lui $12, 30008 # encoding: [0x38,0x75,0x0c,0x3c] # CHECK: lui $12, 30008 # encoding: [0x38,0x75,0x0c,0x3c]
# CHECK: ori $12, $12, 56571 # encoding: [0xfb,0xdc,0x8c,0x35] # CHECK: ori $12, $12, 56571 # encoding: [0xfb,0xdc,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 30232 # encoding: [0x18,0x76,0x8c,0x35] # CHECK: ori $12, $12, 30232 # encoding: [0x18,0x76,0x8c,0x35]
# CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00] # CHECK: dsll $12, $12, 16 # encoding: [0x38,0x64,0x0c,0x00]
# CHECK: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35] # CHECK-NOT: ori $12, $12, 0 # encoding: [0x00,0x00,0x8c,0x35]
dli $t0, 1 dli $t0, 1
dli $t0, 10 dli $t0, 10
dli $t0, 100 dli $t0, 100
dli $t0, 1000 dli $t0, 1000
dli $t0, 10000 dli $t0, 10000
dli $t0, 100000 dli $t0, 100000
dli $t0, 1000000 dli $t0, 1000000
Show All 33 Lines