<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Aug 20, 2015 at 9:16 AM, Douglas Katzman via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dougk<br>
Date: Thu Aug 20 11:16:16 2015<br>
New Revision: 245575<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=245575&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=245575&view=rev</a><br>
Log:<br>
[Sparc]: correct the 'set' synthetic instruction<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D12194" rel="noreferrer" target="_blank">http://reviews.llvm.org/D12194</a><br>
<br>
Added:<br>
llvm/trunk/test/MC/Sparc/sparc-asm-errors.s<br>
Modified:<br>
llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp<br>
llvm/trunk/test/MC/Sparc/sparc-synthetic-instructions.s<br>
<br>
Modified: llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp?rev=245575&r1=245574&r2=245575&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp?rev=245575&r1=245574&r2=245575&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (original)<br>
+++ llvm/trunk/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp Thu Aug 20 11:16:16 2015<br>
@@ -437,7 +437,22 @@ void SparcAsmParser::expandSET(MCInst &I<br>
<br>
// the imm operand can be either an expression or an immediate.<br>
bool IsImm = Inst.getOperand(1).isImm();<br>
- uint64_t ImmValue = IsImm ? MCValOp.getImm() : 0;<br>
+ int64_t RawImmValue = IsImm ? MCValOp.getImm() : 0;<br>
+<br>
+ // Allow either a signed or unsigned 32-bit immediate.<br>
+ if (RawImmValue < -2147483648 || RawImmValue > 4294967295) {<br></blockquote><div><br></div><div>Would it be correct to write this as "isInt<32>(RawImmValue) || isUInt<32>(RawImmValue)" ?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ Error(IDLoc, "set: argument must be between -2147483648 and 4294967295");<br>
+ return;<br>
+ }<br>
+<br>
+ // If the value was expressed as a large unsigned number, that's ok.<br>
+ // We want to see if it "looks like" a small signed number.<br>
+ int32_t ImmValue = RawImmValue;<br>
+ // For 'set' you can't use 'or' with a negative operand on V9 because<br>
+ // that would splat the sign bit across the upper half of the destination<br>
+ // register, whereas 'set' is defined to zero the high 32 bits.<br>
+ bool IsEffectivelyImm13 =<br>
+ IsImm && ((is64Bit() ? 0 : -4096) <= ImmValue && ImmValue < 4096);<br>
const MCExpr *ValExpr;<br>
if (IsImm)<br>
ValExpr = MCConstantExpr::create(ImmValue, getContext());<br>
@@ -446,7 +461,10 @@ void SparcAsmParser::expandSET(MCInst &I<br>
<br>
MCOperand PrevReg = MCOperand::createReg(Sparc::G0);<br>
<br>
- if (!IsImm || (ImmValue & ~0x1fff)) {<br>
+ // If not just a signed imm13 value, then either we use a 'sethi' with a<br>
+ // following 'or', or a 'sethi' by itself if there are no more 1 bits.<br>
+ // In either case, start with the 'sethi'.<br>
+ if (!IsEffectivelyImm13) {<br>
MCInst TmpInst;<br>
const MCExpr *Expr =<br>
SparcMCExpr::create(SparcMCExpr::VK_Sparc_HI, ValExpr, getContext());<br>
@@ -458,10 +476,24 @@ void SparcAsmParser::expandSET(MCInst &I<br>
PrevReg = MCRegOp;<br>
}<br>
<br>
- if (!IsImm || ((ImmValue & 0x1fff) != 0 || ImmValue == 0)) {<br>
+ // The low bits require touching in 3 cases:<br>
+ // * A non-immediate value will always require both instructions.<br>
+ // * An effectively imm13 value needs only an 'or' instruction.<br>
+ // * Otherwise, an immediate that is not effectively imm13 requires the<br>
+ // 'or' only if bits remain after clearing the 22 bits that 'sethi' set.<br>
+ // If the low bits are known zeros, there's nothing to do.<br>
+ // In the second case, and only in that case, must we NOT clear<br>
+ // bits of the immediate value via the %lo() assembler function.<br>
+ // Note also, the 'or' instruction doesn't mind a large value in the case<br>
+ // where the operand to 'set' was 0xFFFFFzzz - it does exactly what you mean.<br>
+ if (!IsImm || IsEffectivelyImm13 || (ImmValue & 0x3ff)) {<br>
MCInst TmpInst;<br>
- const MCExpr *Expr =<br>
- SparcMCExpr::create(SparcMCExpr::VK_Sparc_LO, ValExpr, getContext());<br>
+ const MCExpr *Expr;<br>
+ if (IsEffectivelyImm13)<br>
+ Expr = ValExpr;<br>
+ else<br>
+ Expr =<br>
+ SparcMCExpr::create(SparcMCExpr::VK_Sparc_LO, ValExpr, getContext());<br>
TmpInst.setLoc(IDLoc);<br>
TmpInst.setOpcode(SP::ORri);<br>
TmpInst.addOperand(MCRegOp);<br>
<br>
Added: llvm/trunk/test/MC/Sparc/sparc-asm-errors.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Sparc/sparc-asm-errors.s?rev=245575&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Sparc/sparc-asm-errors.s?rev=245575&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/Sparc/sparc-asm-errors.s (added)<br>
+++ llvm/trunk/test/MC/Sparc/sparc-asm-errors.s Thu Aug 20 11:16:16 2015<br>
@@ -0,0 +1,8 @@<br>
+! RUN: not llvm-mc %s -arch=sparc -show-encoding 2>&1 | FileCheck %s<br>
+! RUN: not llvm-mc %s -arch=sparcv9 -show-encoding 2>&1 | FileCheck %s<br>
+<br>
+! Test the lower and upper bounds of 'set'<br>
+ ! CHECK: argument must be between<br>
+ set -2147483649, %o1<br>
+ ! CHECK: argument must be between<br>
+ set 4294967296, %o1<br>
<br>
Modified: llvm/trunk/test/MC/Sparc/sparc-synthetic-instructions.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Sparc/sparc-synthetic-instructions.s?rev=245575&r1=245574&r2=245575&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Sparc/sparc-synthetic-instructions.s?rev=245575&r1=245574&r2=245575&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/Sparc/sparc-synthetic-instructions.s (original)<br>
+++ llvm/trunk/test/MC/Sparc/sparc-synthetic-instructions.s Thu Aug 20 11:16:16 2015<br>
@@ -27,13 +27,33 @@<br>
! CHECK: or %g1, %lo(40000), %g1 ! encoding: [0x82,0x10,0b011000AA,A]<br>
! CHECK: ! fixup A - offset: 0, value: %lo(40000), kind: fixup_sparc_lo10<br>
set 40000, %g1<br>
- ! CHECK: mov %lo(1), %g1 ! encoding: [0x82,0x10,0b001000AA,A]<br>
- ! CHECK: ! fixup A - offset: 0, value: %lo(1), kind: fixup_sparc_lo10<br>
+ ! CHECK: mov 1, %g1 ! encoding: [0x82,0x10,0x20,0x01]<br>
set 1, %g1<br>
! CHECK: sethi %hi(32768), %g1 ! encoding: [0x03,0b00AAAAAA,A,A]<br>
! CHECK: ! fixup A - offset: 0, value: %hi(32768), kind: fixup_sparc_hi22<br>
set 32768, %g1<br>
<br>
+ ! Expect a 'sethi' without an 'or'.<br>
+ ! CHECK: sethi %hi(268431360), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! CHECK: ! fixup A - offset: 0, value: %hi(268431360), kind: fixup_sparc_hi22<br>
+ set 0x0ffff000, %o1<br>
+<br>
+ ! CHECK: sethi %hi(268433408), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! CHECK: ! fixup A - offset: 0, value: %hi(268433408), kind: fixup_sparc_hi22<br>
+ set 0x0ffff800, %o1<br>
+<br>
+ ! This is the boundary case that uses the lowest of the 22 bits in sethi.<br>
+ ! CHECK: sethi %hi(268434432), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! CHECK: ! fixup A - offset: 0, value: %hi(268434432), kind: fixup_sparc_hi22<br>
+ set 0x0ffffc00, %o1<br>
+<br>
+ ! Now the synthetic instruction becomes two instructions.<br>
+ ! CHECK: sethi %hi(2147483647), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! CHECK: ! fixup A - offset: 0, value: %hi(2147483647), kind: fixup_sparc_hi22<br>
+ ! CHECK: or %o1, %lo(2147483647), %o1 ! encoding: [0x92,0x12,0b011000AA,A]<br>
+ ! CHECK: ! fixup A - offset: 0, value: %lo(2147483647), kind: fixup_sparc_lo10<br>
+ set 2147483647, %o1<br>
+<br>
! CHECK: xnor %g1, %g0, %g2 ! encoding: [0x84,0x38,0x40,0x00]<br>
not %g1, %g2<br>
! CHECK: xnor %g1, %g0, %g1 ! encoding: [0x82,0x38,0x40,0x00]<br>
@@ -143,3 +163,51 @@<br>
wr %i0, %tbr<br>
! CHECK: wr %g0, 5, %tbr ! encoding: [0x81,0x98,0x20,0x05]<br>
wr 5, %tbr<br>
+<br>
+! The following tests exercise 'set' in such a way that its output differs<br>
+! depending on whether targeting V8 or V9.<br>
+!<br>
+! RUN: llvm-mc %s -arch=sparc -show-encoding | FileCheck %s --check-prefix=V8<br>
+! RUN: llvm-mc %s -arch=sparcv9 -show-encoding | FileCheck %s --check-prefix=V9<br>
+<br>
+ ! V8: mov -1, %o1 ! encoding: [0x92,0x10,0x3f,0xff]<br>
+ ! V9: sethi %hi(-1), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %hi(-1), kind: fixup_sparc_hi22<br>
+ ! V9: or %o1, %lo(-1), %o1 ! encoding: [0x92,0x12,0b011000AA,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %lo(-1), kind: fixup_sparc_lo10<br>
+ set 0xffffffff, %o1<br>
+<br>
+ ! V8: mov -2, %o1 ! encoding: [0x92,0x10,0x3f,0xfe]<br>
+ ! V9: sethi %hi(-2), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %hi(-2), kind: fixup_sparc_hi22<br>
+ ! V9: or %o1, %lo(-2), %o1 ! encoding: [0x92,0x12,0b011000AA,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %lo(-2), kind: fixup_sparc_lo10<br>
+ set 0xfffffffe, %o1<br>
+<br>
+ ! V8: mov -16, %o1 ! encoding: [0x92,0x10,0x3f,0xf0]<br>
+ ! V9: sethi %hi(-16), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %hi(-16), kind: fixup_sparc_hi22<br>
+ ! V9: or %o1, %lo(-16), %o1 ! encoding: [0x92,0x12,0b011000AA,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %lo(-16), kind: fixup_sparc_lo10<br>
+ set 0xfffffff0, %o1<br>
+<br>
+ ! V8: mov -256, %o1 ! encoding: [0x92,0x10,0x3f,0x00]<br>
+ ! V9: sethi %hi(-256), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %hi(-256), kind: fixup_sparc_hi22<br>
+ ! V9: or %o1, %lo(-256), %o1 ! encoding: [0x92,0x12,0b011000AA,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %lo(-256), kind: fixup_sparc_lo10<br>
+ set 0xffffff00, %o1<br>
+<br>
+ ! V8: mov -4096, %o1 ! encoding: [0x92,0x10,0x30,0x00]<br>
+ ! V9: sethi %hi(-4096), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %hi(-4096), kind: fixup_sparc_hi22<br>
+ set 0xfffff000, %o1<br>
+<br>
+ ! These results are the same for V8 and V9, so this test could have<br>
+ ! been with the others that weren't segregated by architecture,<br>
+ ! but logically it belongs here as a boundary case.<br>
+ ! V8: sethi %hi(-8192), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! V8: ! fixup A - offset: 0, value: %hi(-8192), kind: fixup_sparc_hi22<br>
+ ! V9: sethi %hi(-8192), %o1 ! encoding: [0x13,0b00AAAAAA,A,A]<br>
+ ! V9: ! fixup A - offset: 0, value: %hi(-8192), kind: fixup_sparc_hi22<br>
+ set 0xffffe000, %o1<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>