From: Colin LeMahieu Date: Tue, 16 Dec 2014 20:40:23 +0000 (+0000) Subject: [Hexagon] Adding asr/lsr/asl reg/imm, asl with saturation, asr with rounding. Double... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50b3134fb4454109bfb3c9df79f202c7c3309630;p=llvm [Hexagon] Adding asr/lsr/asl reg/imm, asl with saturation, asr with rounding. Doubleword abs/neg/not. Interleave and deinterleave instructions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224365 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/Hexagon/HexagonInstrInfo.td b/lib/Target/Hexagon/HexagonInstrInfo.td index 8a86ae98402..eadf93873be 100644 --- a/lib/Target/Hexagon/HexagonInstrInfo.td +++ b/lib/Target/Hexagon/HexagonInstrInfo.td @@ -2765,6 +2765,84 @@ def: Pat<(i32 (xor (add (sra (i32 IntRegs:$src), (i32 31)), (sra (i32 IntRegs:$src), (i32 31)))), (A2_abs IntRegs:$src)>; +class T_S2op_2 RegTyBits, RegisterClass RCOut, + RegisterClass RCIn, bits<3> MajOp, bits<3> MinOp, + bit isSat, bit isRnd, list pattern = []> + : SInst <(outs RCOut:$dst), + (ins RCIn:$src, u5Imm:$u5), + "$dst = "#mnemonic#"($src, #$u5)"#!if(isSat, ":sat", "") + #!if(isRnd, ":rnd", ""), + pattern, "", S_2op_tc_2_SLOT23> { + bits<5> dst; + bits<5> src; + bits<5> u5; + + let IClass = 0b1000; + + let Inst{27-24} = RegTyBits; + let Inst{23-21} = MajOp; + let Inst{20-16} = src; + let Inst{13} = 0b0; + let Inst{12-8} = u5; + let Inst{7-5} = MinOp; + let Inst{4-0} = dst; + } + +let hasNewValue = 1 in +class T_S2op_2_ii MajOp, bits<3> MinOp, + bit isSat = 0, bit isRnd = 0, list pattern = []> + : T_S2op_2 ; + +class T_S2op_shift MajOp, bits<3> MinOp, SDNode OpNd> + : T_S2op_2_ii ; + +// Arithmetic/logical shift right/left by immediate +let Itinerary = S_2op_tc_1_SLOT23, isCodeGenOnly = 0 in { + def S2_asr_i_r : T_S2op_shift <"asr", 0b000, 0b000, sra>; + def S2_lsr_i_r : T_S2op_shift <"lsr", 0b000, 0b001, srl>; + def S2_asl_i_r : T_S2op_shift <"asl", 0b000, 0b010, shl>; +} + +// Shift left by immediate with saturation +let Defs = [USR_OVF], isCodeGenOnly = 0 in +def S2_asl_i_r_sat : T_S2op_2_ii <"asl", 0b010, 0b010, 1>; + +// Shift right with round +let isCodeGenOnly = 0 in +def S2_asr_i_r_rnd : T_S2op_2_ii <"asr", 0b010, 0b000, 0, 1>; + +def: Pat<(i32 (sra (i32 (add (i32 (sra I32:$src1, u5ImmPred:$src2)), + (i32 1))), + (i32 1))), + (S2_asr_i_r_rnd IntRegs:$src1, u5ImmPred:$src2)>; + +class T_S2op_3MajOp, bits<3>minOp, bits<1> sat = 0> + : SInst<(outs DoubleRegs:$Rdd), (ins DoubleRegs:$Rss), + "$Rdd = "#opc#"($Rss)"#!if(!eq(sat, 1),":sat","")> { + bits<5> Rss; + bits<5> Rdd; + let IClass = 0b1000; + let Inst{27-24} = 0; + let Inst{23-22} = MajOp; + let Inst{20-16} = Rss; + let Inst{7-5} = minOp; + let Inst{4-0} = Rdd; +} + +let isCodeGenOnly = 0 in { +def A2_absp : T_S2op_3 <"abs", 0b10, 0b110>; +def A2_negp : T_S2op_3 <"neg", 0b10, 0b101>; +def A2_notp : T_S2op_3 <"not", 0b10, 0b100>; +} + +// Innterleave/deinterleave +let isCodeGenOnly = 0 in { +def S2_interleave : T_S2op_3 <"interleave", 0b11, 0b101>; +def S2_deinterleave : T_S2op_3 <"deinterleave", 0b11, 0b100>; +} //===----------------------------------------------------------------------===// // STYPE/BIT + diff --git a/test/MC/Disassembler/Hexagon/xtype_alu.txt b/test/MC/Disassembler/Hexagon/xtype_alu.txt index 4603432d173..ea4b18126e1 100644 --- a/test/MC/Disassembler/Hexagon/xtype_alu.txt +++ b/test/MC/Disassembler/Hexagon/xtype_alu.txt @@ -1,5 +1,7 @@ # RUN: llvm-mc --triple hexagon -disassemble < %s | FileCheck %s +0xd0 0xc0 0x94 0x80 +# CHECK: r17:16 = abs(r21:20) 0x91 0xc0 0x95 0x8c # CHECK: r17 = abs(r21) 0xb1 0xc0 0x95 0x8c @@ -38,6 +40,8 @@ # CHECK: r17 = add(r21.h, r31.l):sat:<<16 0xf1 0xd5 0x5f 0xd5 # CHECK: r17 = add(r21.h, r31.h):sat:<<16 +0x90 0xc0 0x94 0x80 +# CHECK: r17:16 = not(r21:20) 0xf0 0xde 0x14 0xd3 # CHECK: r17:16 = add(r21:20, r31:30) 0xb0 0xde 0x74 0xd3 @@ -68,6 +72,8 @@ # CHECK: r17:16 = min(r21:20, r31:30) 0xf0 0xd4 0xbe 0xd3 # CHECK: r17:16 = minu(r21:20, r31:30) +0xb0 0xc0 0x94 0x80 +# CHECK: r17:16 = neg(r21:20) 0xd1 0xc0 0x95 0x8c # CHECK: r17 = neg(r21):sat 0x71 0xd5 0x1f 0xef diff --git a/test/MC/Disassembler/Hexagon/xtype_bit.txt b/test/MC/Disassembler/Hexagon/xtype_bit.txt index 021631dde55..40e5f0335e2 100644 --- a/test/MC/Disassembler/Hexagon/xtype_bit.txt +++ b/test/MC/Disassembler/Hexagon/xtype_bit.txt @@ -1,4 +1,8 @@ # RUN: llvm-mc --triple hexagon -disassemble < %s | FileCheck %s +0x90 0xc0 0xd4 0x80 +# CHECK: r17:16 = deinterleave(r21:20) +0xb0 0xc0 0xd4 0x80 +# CHECK: r17:16 = interleave(r21:20) 0x11 0xde 0x14 0xd0 # CHECK: r17 = parity(r21:20, r31:30) diff --git a/test/MC/Disassembler/Hexagon/xtype_shift.txt b/test/MC/Disassembler/Hexagon/xtype_shift.txt new file mode 100644 index 00000000000..230071c4771 --- /dev/null +++ b/test/MC/Disassembler/Hexagon/xtype_shift.txt @@ -0,0 +1,12 @@ +# RUN: llvm-mc --triple hexagon -disassemble < %s | FileCheck %s + +0x11 0xdf 0x15 0x8c +# CHECK: r17 = asr(r21, #31) +0x31 0xdf 0x15 0x8c +# CHECK: r17 = lsr(r21, #31) +0x51 0xdf 0x15 0x8c +# CHECK: r17 = asl(r21, #31) +0x11 0xdf 0x55 0x8c +# CHECK: r17 = asr(r21, #31):rnd +0x51 0xdf 0x55 0x8c +# CHECK: r17 = asl(r21, #31):sat