diff --git a/lib/Target/Hexagon/HexagonInstrInfo.cpp b/lib/Target/Hexagon/HexagonInstrInfo.cpp index 0b32d8cd6e0..c320575ae68 100644 --- a/lib/Target/Hexagon/HexagonInstrInfo.cpp +++ b/lib/Target/Hexagon/HexagonInstrInfo.cpp @@ -1299,12 +1299,14 @@ bool HexagonInstrInfo::isConditionalALU32 (const MachineInstr* MI) const { case Hexagon::A2_paddfnew: case Hexagon::A2_paddt: case Hexagon::A2_paddtnew: + case Hexagon::A2_pandf: + case Hexagon::A2_pandfnew: + case Hexagon::A2_pandt: + case Hexagon::A2_pandtnew: case Hexagon::ADD_ri_cPt: case Hexagon::ADD_ri_cNotPt: case Hexagon::XOR_rr_cPt: case Hexagon::XOR_rr_cNotPt: - case Hexagon::AND_rr_cPt: - case Hexagon::AND_rr_cNotPt: case Hexagon::OR_rr_cPt: case Hexagon::OR_rr_cNotPt: case Hexagon::SUB_rr_cPt: diff --git a/lib/Target/Hexagon/HexagonInstrInfo.td b/lib/Target/Hexagon/HexagonInstrInfo.td index f06c1dcd0b1..826b76e36fc 100644 --- a/lib/Target/Hexagon/HexagonInstrInfo.td +++ b/lib/Target/Hexagon/HexagonInstrInfo.td @@ -162,6 +162,7 @@ multiclass T_ALU32_3op_A2 MajOp, bits<3> MinOp, let isCodeGenOnly = 0 in defm add : T_ALU32_3op_A2<"add", 0b011, 0b000, 0, 1>; +defm and : T_ALU32_3op_A2<"and", 0b001, 0b000, 0, 1>; defm sub : T_ALU32_3op_A2<"sub", 0b011, 0b001, 1, 0>; // Pats for instruction selection. @@ -170,6 +171,7 @@ class BinOp32_pat (ResT (MI IntRegs:$Rs, IntRegs:$Rt))>; def: BinOp32_pat; +def: BinOp32_pat; def: BinOp32_pat; multiclass ALU32_Pbase { } let isCommutable = 1 in { - defm AND_rr : ALU32_base<"and", "AND", and>, ImmRegRel, PredNewRel; defm XOR_rr : ALU32_base<"xor", "XOR", xor>, ImmRegRel, PredNewRel; defm OR_rr : ALU32_base<"or", "OR", or>, ImmRegRel, PredNewRel; } @@ -2291,7 +2292,7 @@ def : Pat <(i64 (zextloadi1 (HexagonCONST32 tglobaladdr:$global))), // Map from i1 loads to 32 bits. This assumes that the i1* is byte aligned. let AddedComplexity = 10 in def : Pat <(i32 (zextloadi1 ADDRriS11_0:$addr)), - (i32 (AND_rr (i32 (LDrib ADDRriS11_0:$addr)), (TFRI 0x1)))>; + (i32 (A2_and (i32 (LDrib ADDRriS11_0:$addr)), (TFRI 0x1)))>; // Map from Rdd = sign_extend_inreg(Rss, i32) -> Rdd = SXTW(Rss.lo). def : Pat <(i64 (sext_inreg (i64 DoubleRegs:$src1), i32)), diff --git a/test/MC/Hexagon/inst_and.ll b/test/MC/Hexagon/inst_and.ll new file mode 100644 index 00000000000..16bf3047743 --- /dev/null +++ b/test/MC/Hexagon/inst_and.ll @@ -0,0 +1,10 @@ +;; RUN: llc -mtriple=hexagon-unknown-elf -filetype=obj %s -o - \ +;; RUN: | llvm-objdump -s - | FileCheck %s + +define i32 @foo (i32 %a, i32 %b) +{ + %1 = and i32 %a, %b + ret i32 %1 +} + +; CHECK: 0000 004100f1 00c09f52 \ No newline at end of file