6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-17 04:24:00 +00:00
Code Issues Projects Releases Wiki Activity

Use subclassing to print lane-like immediates (w/o hash) eliminating

Browse Source 
'no_hash' modifier. Hopefully this will make Daniel happy :)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78514 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Anton Korobeynikov
2009-08-08 23:10:41 +00:00
parent 72ffae90ce
commit 8e9ece75db
5 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Target/ARM/ARMInstrInfo.td
View File

@ -327,6 +327,10 @@ def addrmodepc : Operand<i32>,
let MIOperandInfo = (ops GPR, i32imm); let MIOperandInfo = (ops GPR, i32imm);
} }
def lane_cst : Operand<i32> {
let PrintMethod = "printLaneOperand";
}
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
include "ARMInstrFormats.td" include "ARMInstrFormats.td"
@ -577,10 +581,10 @@ def LEApcrel : AXI1<0x0, (outs GPR:$dst), (ins i32imm:$label, pred:$p),
[]>; []>;
def LEApcrelJT : AXI1<0x0, (outs GPR:$dst), def LEApcrelJT : AXI1<0x0, (outs GPR:$dst),
(ins i32imm:$label, i32imm:$id, pred:$p), (ins i32imm:$label, lane_cst:$id, pred:$p),
Pseudo, IIC_iLoad, Pseudo, IIC_iLoad,
!strconcat(!strconcat(".set ${:private}PCRELV${:uid}, " !strconcat(!strconcat(".set ${:private}PCRELV${:uid}, "
"(${label}_${id:no_hash}-(", "(${label}_${id}-(",
"${:private}PCRELL${:uid}+8))\n"), "${:private}PCRELL${:uid}+8))\n"),
!strconcat("${:private}PCRELL${:uid}:\n\t", !strconcat("${:private}PCRELL${:uid}:\n\t",
"add$p $dst, pc, #${:private}PCRELV${:uid}")), "add$p $dst, pc, #${:private}PCRELV${:uid}")),

40
lib/Target/ARM/ARMInstrNEON.td
View File

@ -1618,28 +1618,28 @@ def VMOVv2i64 : N1ModImm<1, 0b000, 0b1110, 0, 1, 1, 1, (outs QPR:$dst),
// VMOV : Vector Get Lane (move scalar to ARM core register) // VMOV : Vector Get Lane (move scalar to ARM core register)
def VGETLNs8 : NVGetLane<0b11100101, 0b1011, 0b00, def VGETLNs8 : NVGetLane<0b11100101, 0b1011, 0b00,
(outs GPR:$dst), (ins DPR:$src, i32imm:$lane), (outs GPR:$dst), (ins DPR:$src, lane_cst:$lane),
NoItinerary, "vmov", ".s8\t$dst, $src[${lane:no_hash}]", NoItinerary, "vmov", ".s8\t$dst, $src[$lane]",
[(set GPR:$dst, (NEONvgetlanes (v8i8 DPR:$src), [(set GPR:$dst, (NEONvgetlanes (v8i8 DPR:$src),
imm:$lane))]>; imm:$lane))]>;
def VGETLNs16 : NVGetLane<0b11100001, 0b1011, 0b01, def VGETLNs16 : NVGetLane<0b11100001, 0b1011, 0b01,
(outs GPR:$dst), (ins DPR:$src, i32imm:$lane), (outs GPR:$dst), (ins DPR:$src, lane_cst:$lane),
NoItinerary, "vmov", ".s16\t$dst, $src[${lane:no_hash}]", NoItinerary, "vmov", ".s16\t$dst, $src[$lane]",
[(set GPR:$dst, (NEONvgetlanes (v4i16 DPR:$src), [(set GPR:$dst, (NEONvgetlanes (v4i16 DPR:$src),
imm:$lane))]>; imm:$lane))]>;
def VGETLNu8 : NVGetLane<0b11101101, 0b1011, 0b00, def VGETLNu8 : NVGetLane<0b11101101, 0b1011, 0b00,
(outs GPR:$dst), (ins DPR:$src, i32imm:$lane), (outs GPR:$dst), (ins DPR:$src, lane_cst:$lane),
NoItinerary, "vmov", ".u8\t$dst, $src[${lane:no_hash}]", NoItinerary, "vmov", ".u8\t$dst, $src[$lane]",
[(set GPR:$dst, (NEONvgetlaneu (v8i8 DPR:$src), [(set GPR:$dst, (NEONvgetlaneu (v8i8 DPR:$src),
imm:$lane))]>; imm:$lane))]>;
def VGETLNu16 : NVGetLane<0b11101001, 0b1011, 0b01, def VGETLNu16 : NVGetLane<0b11101001, 0b1011, 0b01,
(outs GPR:$dst), (ins DPR:$src, i32imm:$lane), (outs GPR:$dst), (ins DPR:$src, lane_cst:$lane),
NoItinerary, "vmov", ".u16\t$dst, $src[${lane:no_hash}]", NoItinerary, "vmov", ".u16\t$dst, $src[$lane]",
[(set GPR:$dst, (NEONvgetlaneu (v4i16 DPR:$src), [(set GPR:$dst, (NEONvgetlaneu (v4i16 DPR:$src),
imm:$lane))]>; imm:$lane))]>;
def VGETLNi32 : NVGetLane<0b11100001, 0b1011, 0b00, def VGETLNi32 : NVGetLane<0b11100001, 0b1011, 0b00,
(outs GPR:$dst), (ins DPR:$src, i32imm:$lane), (outs GPR:$dst), (ins DPR:$src, lane_cst:$lane),
NoItinerary, "vmov", ".32\t$dst, $src[${lane:no_hash}]", NoItinerary, "vmov", ".32\t$dst, $src[$lane]",
[(set GPR:$dst, (extractelt (v2i32 DPR:$src), [(set GPR:$dst, (extractelt (v2i32 DPR:$src),
imm:$lane))]>; imm:$lane))]>;
// def VGETLNf32: see FMRDH and FMRDL in ARMInstrVFP.td // def VGETLNf32: see FMRDH and FMRDL in ARMInstrVFP.td
@ -1675,18 +1675,18 @@ def : Pat<(extractelt (v2f64 QPR:$src1), imm:$src2),
let Constraints = "$src1 = $dst" in { let Constraints = "$src1 = $dst" in {
def VSETLNi8 : NVSetLane<0b11100100, 0b1011, 0b00, (outs DPR:$dst), def VSETLNi8 : NVSetLane<0b11100100, 0b1011, 0b00, (outs DPR:$dst),
(ins DPR:$src1, GPR:$src2, i32imm:$lane), (ins DPR:$src1, GPR:$src2, lane_cst:$lane),
NoItinerary, "vmov", ".8\t$dst[${lane:no_hash}], $src2", NoItinerary, "vmov", ".8\t$dst[$lane], $src2",
[(set DPR:$dst, (vector_insert (v8i8 DPR:$src1), [(set DPR:$dst, (vector_insert (v8i8 DPR:$src1),
GPR:$src2, imm:$lane))]>; GPR:$src2, imm:$lane))]>;
def VSETLNi16 : NVSetLane<0b11100000, 0b1011, 0b01, (outs DPR:$dst), def VSETLNi16 : NVSetLane<0b11100000, 0b1011, 0b01, (outs DPR:$dst),
(ins DPR:$src1, GPR:$src2, i32imm:$lane), (ins DPR:$src1, GPR:$src2, lane_cst:$lane),
NoItinerary, "vmov", ".16\t$dst[${lane:no_hash}], $src2", NoItinerary, "vmov", ".16\t$dst[$lane], $src2",
[(set DPR:$dst, (vector_insert (v4i16 DPR:$src1), [(set DPR:$dst, (vector_insert (v4i16 DPR:$src1),
GPR:$src2, imm:$lane))]>; GPR:$src2, imm:$lane))]>;
def VSETLNi32 : NVSetLane<0b11100000, 0b1011, 0b00, (outs DPR:$dst), def VSETLNi32 : NVSetLane<0b11100000, 0b1011, 0b00, (outs DPR:$dst),
(ins DPR:$src1, GPR:$src2, i32imm:$lane), (ins DPR:$src1, GPR:$src2, lane_cst:$lane),
NoItinerary, "vmov", ".32\t$dst[${lane:no_hash}], $src2", NoItinerary, "vmov", ".32\t$dst[$lane], $src2",
[(set DPR:$dst, (insertelt (v2i32 DPR:$src1), [(set DPR:$dst, (insertelt (v2i32 DPR:$src1),
GPR:$src2, imm:$lane))]>; GPR:$src2, imm:$lane))]>;
} }
@ -1769,8 +1769,8 @@ def splat_lane : PatFrag<(ops node:$lhs, node:$rhs),
class VDUPLND<bits<2> op19_18, bits<2> op17_16, string OpcodeStr, ValueType Ty> class VDUPLND<bits<2> op19_18, bits<2> op17_16, string OpcodeStr, ValueType Ty>
: N2V<0b11, 0b11, op19_18, op17_16, 0b11000, 0, 0, : N2V<0b11, 0b11, op19_18, op17_16, 0b11000, 0, 0,
(outs DPR:$dst), (ins DPR:$src, i32imm:$lane), NoItinerary, (outs DPR:$dst), (ins DPR:$src, lane_cst:$lane), NoItinerary,
!strconcat(OpcodeStr, "\t$dst, $src[${lane:no_hash}]"), "", !strconcat(OpcodeStr, "\t$dst, $src[$lane]"), "",
[(set DPR:$dst, (Ty (splat_lane:$lane DPR:$src, undef)))]>; [(set DPR:$dst, (Ty (splat_lane:$lane DPR:$src, undef)))]>;
// vector_shuffle requires that the source and destination types match, so // vector_shuffle requires that the source and destination types match, so
@ -1778,8 +1778,8 @@ class VDUPLND<bits<2> op19_18, bits<2> op17_16, string OpcodeStr, ValueType Ty>
class VDUPLNQ<bits<2> op19_18, bits<2> op17_16, string OpcodeStr, class VDUPLNQ<bits<2> op19_18, bits<2> op17_16, string OpcodeStr,
ValueType ResTy, ValueType OpTy> ValueType ResTy, ValueType OpTy>
: N2V<0b11, 0b11, op19_18, op17_16, 0b11000, 1, 0, : N2V<0b11, 0b11, op19_18, op17_16, 0b11000, 1, 0,
(outs QPR:$dst), (ins DPR:$src, i32imm:$lane), NoItinerary, (outs QPR:$dst), (ins DPR:$src, lane_cst:$lane), NoItinerary,
!strconcat(OpcodeStr, "\t$dst, $src[${lane:no_hash}]"), "", !strconcat(OpcodeStr, "\t$dst, $src[$lane]"), "",
[(set QPR:$dst, (ResTy (NEONvduplaneq (OpTy DPR:$src), imm:$lane)))]>; [(set QPR:$dst, (ResTy (NEONvduplaneq (OpTy DPR:$src), imm:$lane)))]>;
def VDUPLN8d : VDUPLND<0b00, 0b01, "vdup.8", v8i8>; def VDUPLN8d : VDUPLND<0b00, 0b01, "vdup.8", v8i8>;

4
lib/Target/ARM/ARMInstrThumb.td
View File

@ -614,8 +614,8 @@ let usesCustomDAGSchedInserter = 1 in // Expanded by the scheduler.
def tLEApcrel : T1I<(outs tGPR:$dst), (ins i32imm:$label), IIC_iALU, def tLEApcrel : T1I<(outs tGPR:$dst), (ins i32imm:$label), IIC_iALU,
"adr $dst, #$label", []>; "adr $dst, #$label", []>;
def tLEApcrelJT : T1I<(outs tGPR:$dst), (ins i32imm:$label, i32imm:$id), IIC_iALU, def tLEApcrelJT : T1I<(outs tGPR:$dst), (ins i32imm:$label, lane_cst:$id), IIC_iALU,
"adr $dst, #${label}_${id:no_hash}", []>; "adr $dst, #${label}_${id}", []>;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// TLS Instructions // TLS Instructions

4
lib/Target/ARM/ARMInstrThumb2.td
View File

@ -429,8 +429,8 @@ def t2LEApcrel : T2XI<(outs GPR:$dst), (ins i32imm:$label, pred:$p), IIC_iALU,
"adr$p.w $dst, #$label", []>; "adr$p.w $dst, #$label", []>;
def t2LEApcrelJT : T2XI<(outs GPR:$dst), def t2LEApcrelJT : T2XI<(outs GPR:$dst),
(ins i32imm:$label, i32imm:$id, pred:$p), IIC_iALU, (ins i32imm:$label, lane_cst:$id, pred:$p), IIC_iALU,
"adr$p.w $dst, #${label}_${id:no_hash}", []>; "adr$p.w $dst, #${label}_${id}", []>;
// ADD r, sp, {so_imm|i12} // ADD r, sp, {so_imm|i12}

11
lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
View File

@ -162,6 +162,7 @@ namespace {
void printJTBlockOperand(const MachineInstr *MI, int OpNum); void printJTBlockOperand(const MachineInstr *MI, int OpNum);
void printJT2BlockOperand(const MachineInstr *MI, int OpNum); void printJT2BlockOperand(const MachineInstr *MI, int OpNum);
void printTBAddrMode(const MachineInstr *MI, int OpNum); void printTBAddrMode(const MachineInstr *MI, int OpNum);
void printLaneOperand(const MachineInstr *MI, int OpNum);
virtual bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNum, virtual bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNum,
unsigned AsmVariant, const char *ExtraCode); unsigned AsmVariant, const char *ExtraCode);
@ -358,10 +359,7 @@ void ARMAsmPrinter::printOperand(const MachineInstr *MI, int OpNum,
break; break;
} }
case MachineOperand::MO_Immediate: { case MachineOperand::MO_Immediate: {
if (!Modifier || strcmp(Modifier, "no_hash") != 0) O << '#' << MO.getImm();
O << '#';
O << MO.getImm();
break; break;
} }
case MachineOperand::MO_MachineBasicBlock: case MachineOperand::MO_MachineBasicBlock:
@ -1011,6 +1009,9 @@ void ARMAsmPrinter::printTBAddrMode(const MachineInstr *MI, int OpNum) {
O << ']'; O << ']';
} }
void ARMAsmPrinter::printLaneOperand(const MachineInstr *MI, int OpNum) {
O << MI->getOperand(OpNum).getImm();
}
bool ARMAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNum, bool ARMAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNum,
unsigned AsmVariant, const char *ExtraCode){ unsigned AsmVariant, const char *ExtraCode){
@ -1027,7 +1028,7 @@ bool ARMAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNum,
} }
// Fallthrough // Fallthrough
case 'c': // Don't print "#" before an immediate operand. case 'c': // Don't print "#" before an immediate operand.
printOperand(MI, OpNum, "no_hash"); printLaneOperand(MI, OpNum);
return false; return false;
case 'P': // Print a VFP double precision register. case 'P': // Print a VFP double precision register.
printOperand(MI, OpNum); printOperand(MI, OpNum);