From 326816c88f22f28c592c70d73bad8f34b59bbc89 Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Fri, 21 Nov 2014 21:35:52 +0000 Subject: [PATCH] [Hexagon] Adding sxtb instruction. Renaming some identically named classes that will be removed after converting referencing defs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222575 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Hexagon/HexagonInstrInfo.cpp | 8 ++- lib/Target/Hexagon/HexagonInstrInfo.td | 94 +++++++++++++++++++++---- test/MC/Hexagon/inst_sxtb.ll | 10 +++ 3 files changed, 97 insertions(+), 15 deletions(-) create mode 100644 test/MC/Hexagon/inst_sxtb.ll diff --git a/lib/Target/Hexagon/HexagonInstrInfo.cpp b/lib/Target/Hexagon/HexagonInstrInfo.cpp index 42847000c94..3c7d63487cb 100644 --- a/lib/Target/Hexagon/HexagonInstrInfo.cpp +++ b/lib/Target/Hexagon/HexagonInstrInfo.cpp @@ -715,7 +715,7 @@ bool HexagonInstrInfo::isPredicable(MachineInstr *MI) const { case Hexagon::ASLH: case Hexagon::ASRH: - case Hexagon::SXTB: + case Hexagon::A2_sxtb: case Hexagon::SXTH: case Hexagon::ZXTB: case Hexagon::ZXTH: @@ -1315,6 +1315,10 @@ bool HexagonInstrInfo::isConditionalALU32 (const MachineInstr* MI) const { case Hexagon::A2_pxorfnew: case Hexagon::A2_pxort: case Hexagon::A2_pxortnew: + case Hexagon::A4_psxtbf: + case Hexagon::A4_psxtbfnew: + case Hexagon::A4_psxtbt: + case Hexagon::A4_psxtbtnew: case Hexagon::ADD_ri_cPt: case Hexagon::ADD_ri_cNotPt: case Hexagon::COMBINE_rr_cPt: @@ -1324,8 +1328,6 @@ bool HexagonInstrInfo::isConditionalALU32 (const MachineInstr* MI) const { case Hexagon::ASLH_cNotPt_V4: case Hexagon::ASRH_cPt_V4: case Hexagon::ASRH_cNotPt_V4: - case Hexagon::SXTB_cPt_V4: - case Hexagon::SXTB_cNotPt_V4: case Hexagon::SXTH_cPt_V4: case Hexagon::SXTH_cNotPt_V4: case Hexagon::ZXTB_cPt_V4: diff --git a/lib/Target/Hexagon/HexagonInstrInfo.td b/lib/Target/Hexagon/HexagonInstrInfo.td index 029b81d8e97..0e6e69f088b 100644 --- a/lib/Target/Hexagon/HexagonInstrInfo.td +++ b/lib/Target/Hexagon/HexagonInstrInfo.td @@ -196,6 +196,77 @@ multiclass ALU32_Pred { } } +//===----------------------------------------------------------------------===// +// template class for non-predicated alu32_2op instructions +// - aslh, asrh, sxtb, sxth, zxth +//===----------------------------------------------------------------------===// +let hasNewValue = 1, opNewValue = 0 in +class T_ALU32_2op minOp> : + ALU32Inst < (outs IntRegs:$Rd), (ins IntRegs:$Rs), + "$Rd = "#mnemonic#"($Rs)", [] > { + bits<5> Rd; + bits<5> Rs; + + let IClass = 0b0111; + + let Inst{27-24} = 0b0000; + let Inst{23-21} = minOp; + let Inst{13} = 0b0; + let Inst{4-0} = Rd; + let Inst{20-16} = Rs; +} + +//===----------------------------------------------------------------------===// +// template class for predicated alu32_2op instructions +// - aslh, asrh, sxtb, sxth, zxtb, zxth +//===----------------------------------------------------------------------===// +let hasSideEffects = 0, validSubTargets = HasV4SubT, + hasNewValue = 1, opNewValue = 0 in +class T_ALU32_2op_Pred minOp, bit isPredNot, + bit isPredNew > : + ALU32Inst <(outs IntRegs:$Rd), (ins PredRegs:$Pu, IntRegs:$Rs), + !if(isPredNot, "if (!$Pu", "if ($Pu") + #!if(isPredNew, ".new) ",") ")#"$Rd = "#mnemonic#"($Rs)"> { + bits<5> Rd; + bits<2> Pu; + bits<5> Rs; + + let IClass = 0b0111; + + let Inst{27-24} = 0b0000; + let Inst{23-21} = minOp; + let Inst{13} = 0b1; + let Inst{11} = isPredNot; + let Inst{10} = isPredNew; + let Inst{4-0} = Rd; + let Inst{9-8} = Pu; + let Inst{20-16} = Rs; +} + +multiclass ALU32_2op_Pred minOp, bit PredNot> { + let isPredicatedFalse = PredNot in { + def NAME : T_ALU32_2op_Pred; + + // Predicate new + let isPredicatedNew = 1 in + def NAME#new : T_ALU32_2op_Pred; + } +} + +multiclass ALU32_2op_base minOp> { + let BaseOpcode = mnemonic in { + let isPredicable = 1, hasSideEffects = 0 in + def A2_#NAME : T_ALU32_2op; + + let validSubTargets = HasV4SubT, isPredicated = 1, hasSideEffects = 0 in { + defm A4_p#NAME#t : ALU32_2op_Pred; + defm A4_p#NAME#f : ALU32_2op_Pred; + } + } +} + +defm sxtb : ALU32_2op_base<"sxtb", 0b101>, PredNewRel; + // Combines the two integer registers SRC1 and SRC2 into a double register. let isPredicable = 1 in class T_Combine : ALU32_rr<(outs DoubleRegs:$dst), @@ -501,7 +572,7 @@ multiclass ALU32_2op_Pbase { Requires<[HasV4T]>; } -multiclass ALU32_2op_Pred { +multiclass ALU32_2op_Pred2 { let isPredicatedFalse = PredNot in { defm _c#NAME : ALU32_2op_Pbase; // Predicate new @@ -509,7 +580,7 @@ multiclass ALU32_2op_Pred { } } -multiclass ALU32_2op_base { +multiclass ALU32_2op_base2 { let BaseOpcode = mnemonic in { let isPredicable = 1, neverHasSideEffects = 1 in def NAME : ALU32Inst<(outs IntRegs:$dst), @@ -518,18 +589,17 @@ multiclass ALU32_2op_base { let Predicates = [HasV4T], validSubTargets = HasV4SubT, isPredicated = 1, neverHasSideEffects = 1 in { - defm Pt_V4 : ALU32_2op_Pred; - defm NotPt_V4 : ALU32_2op_Pred; + defm Pt_V4 : ALU32_2op_Pred2; + defm NotPt_V4 : ALU32_2op_Pred2; } } } -defm ASLH : ALU32_2op_base<"aslh">, PredNewRel; -defm ASRH : ALU32_2op_base<"asrh">, PredNewRel; -defm SXTB : ALU32_2op_base<"sxtb">, PredNewRel; -defm SXTH : ALU32_2op_base<"sxth">, PredNewRel; -defm ZXTB : ALU32_2op_base<"zxtb">, PredNewRel; -defm ZXTH : ALU32_2op_base<"zxth">, PredNewRel; +defm ASLH : ALU32_2op_base2<"aslh">, PredNewRel; +defm ASRH : ALU32_2op_base2<"asrh">, PredNewRel; +defm SXTH : ALU32_2op_base2<"sxth">, PredNewRel; +defm ZXTB : ALU32_2op_base2<"zxtb">, PredNewRel; +defm ZXTH : ALU32_2op_base2<"zxth">, PredNewRel; def : Pat <(shl (i32 IntRegs:$src1), (i32 16)), (ASLH IntRegs:$src1)>; @@ -538,7 +608,7 @@ def : Pat <(sra (i32 IntRegs:$src1), (i32 16)), (ASRH IntRegs:$src1)>; def : Pat <(sext_inreg (i32 IntRegs:$src1), i8), - (SXTB IntRegs:$src1)>; + (A2_sxtb IntRegs:$src1)>; def : Pat <(sext_inreg (i32 IntRegs:$src1), i16), (SXTH IntRegs:$src1)>; @@ -2285,7 +2355,7 @@ def : Pat <(i64 (sext_inreg (i64 DoubleRegs:$src1), i16)), // Map from Rdd = sign_extend_inreg(Rss, i8) -> Rdd = SXTW(SXTB(Rss.lo)). def : Pat <(i64 (sext_inreg (i64 DoubleRegs:$src1), i8)), - (i64 (SXTW (i32 (SXTB (i32 (EXTRACT_SUBREG (i64 DoubleRegs:$src1), + (i64 (SXTW (i32 (A2_sxtb (i32 (EXTRACT_SUBREG (i64 DoubleRegs:$src1), subreg_loreg))))))>; // We want to prevent emitting pnot's as much as possible. diff --git a/test/MC/Hexagon/inst_sxtb.ll b/test/MC/Hexagon/inst_sxtb.ll new file mode 100644 index 00000000000..632df7646e4 --- /dev/null +++ b/test/MC/Hexagon/inst_sxtb.ll @@ -0,0 +1,10 @@ +;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \ +;; RUN: | llvm-objdump -s - | FileCheck %s + +define i32 @foo (i8 %a) +{ + %1 = sext i8 %a to i32 + ret i32 %1 +} + +; CHECK: 0000 0040a070 00c09f52 \ No newline at end of file -- 2.34.1