UNSPEC_EH_RETURN
;; Bit operation
- UNSPEC_BYTEPICK_W
- UNSPEC_BYTEPICK_D
UNSPEC_BITREV_4B
UNSPEC_BITREV_8B
(UNSPEC_FTINTRM "0")
(UNSPEC_FTINTRP "0")])
+;; Iterator and attributes for bytepick.d
+(define_int_iterator bytepick_w_ashift_amount [8 16 24])
+(define_int_attr bytepick_w_lshiftrt_amount [(8 "24")
+ (16 "16")
+ (24 "8")])
+(define_int_iterator bytepick_d_ashift_amount [8 16 24 32 40 48 56])
+(define_int_attr bytepick_d_lshiftrt_amount [(8 "56")
+ (16 "48")
+ (24 "40")
+ (32 "32")
+ (40 "24")
+ (48 "16")
+ (56 "8")])
+(define_int_attr bytepick_imm [(8 "1")
+ (16 "2")
+ (24 "3")
+ (32 "4")
+ (40 "5")
+ (48 "6")
+ (56 "7")])
+
;;
;; ....................
;;
[(set_attr "type" "unknown")
(set_attr "mode" "<MODE>")])
-(define_insn "bytepick_w"
+(define_insn "bytepick_w_<bytepick_imm>"
[(set (match_operand:SI 0 "register_operand" "=r")
- (unspec:SI [(match_operand:SI 1 "register_operand" "r")
- (match_operand:SI 2 "register_operand" "r")
- (match_operand:SI 3 "const_0_to_3_operand" "n")]
- UNSPEC_BYTEPICK_W))]
+ (ior:SI (lshiftrt (match_operand:SI 1 "register_operand" "r")
+ (const_int <bytepick_w_lshiftrt_amount>))
+ (ashift (match_operand:SI 2 "register_operand" "r")
+ (const_int bytepick_w_ashift_amount))))]
""
- "bytepick.w\t%0,%1,%2,%z3"
+ "bytepick.w\t%0,%1,%2,<bytepick_imm>"
[(set_attr "mode" "SI")])
-(define_insn "bytepick_d"
+(define_insn "bytepick_w_<bytepick_imm>_extend"
[(set (match_operand:DI 0 "register_operand" "=r")
- (unspec:DI [(match_operand:DI 1 "register_operand" "r")
- (match_operand:DI 2 "register_operand" "r")
- (match_operand:DI 3 "const_0_to_7_operand" "n")]
- UNSPEC_BYTEPICK_D))]
- ""
- "bytepick.d\t%0,%1,%2,%z3"
+ (sign_extend:DI
+ (ior:SI (lshiftrt (match_operand:SI 1 "register_operand" "r")
+ (const_int <bytepick_w_lshiftrt_amount>))
+ (ashift (match_operand:SI 2 "register_operand" "r")
+ (const_int bytepick_w_ashift_amount)))))]
+ "TARGET_64BIT"
+ "bytepick.w\t%0,%1,%2,<bytepick_imm>"
+ [(set_attr "mode" "SI")])
+
+(define_insn "bytepick_d_<bytepick_imm>"
+ [(set (match_operand:DI 0 "register_operand" "=r")
+ (ior:DI (lshiftrt (match_operand:DI 1 "register_operand" "r")
+ (const_int <bytepick_d_lshiftrt_amount>))
+ (ashift (match_operand:DI 2 "register_operand" "r")
+ (const_int bytepick_d_ashift_amount))))]
+ "TARGET_64BIT"
+ "bytepick.d\t%0,%1,%2,<bytepick_imm>"
[(set_attr "mode" "DI")])
(define_insn "bitrev_4b"
(ior (match_operand 0 "const_1_operand")
(match_operand 0 "register_operand")))
-(define_predicate "const_0_to_3_operand"
- (and (match_code "const_int")
- (match_test "IN_RANGE (INTVAL (op), 0, 3)")))
-
-(define_predicate "const_0_to_7_operand"
- (and (match_code "const_int")
- (match_test "IN_RANGE (INTVAL (op), 0, 7)")))
-
(define_predicate "lu52i_mask_operand"
(and (match_code "const_int")
(match_test "UINTVAL (op) == 0xfffffffffffff")))
--- /dev/null
+/* { dg-do compile } */
+/* { dg-options "-O2 -mabi=lp64d" } */
+/* { dg-final { scan-assembler-times "bytepick.w\t\\\$r4,\\\$r5,\\\$r4" 3 } } */
+/* { dg-final { scan-assembler-times "bytepick.d\t\\\$r4,\\\$r5,\\\$r4" 7 } } */
+/* { dg-final { scan-assembler-not "slli.w" } } */
+
+template <class T, int offs>
+T
+merge (T a, T b)
+{
+ return a << offs | b >> (8 * sizeof (T) - offs);
+}
+
+using u32 = __UINT32_TYPE__;
+using u64 = __UINT64_TYPE__;
+using i64 = __INT64_TYPE__;
+
+template u32 merge<u32, 8> (u32, u32);
+template u32 merge<u32, 16> (u32, u32);
+template u32 merge<u32, 24> (u32, u32);
+
+template u64 merge<u64, 8> (u64, u64);
+template u64 merge<u64, 16> (u64, u64);
+template u64 merge<u64, 24> (u64, u64);
+template u64 merge<u64, 32> (u64, u64);
+template u64 merge<u64, 40> (u64, u64);
+template u64 merge<u64, 48> (u64, u64);
+template u64 merge<u64, 56> (u64, u64);
+
+/* we cannot use bytepick for the following cases */
+template i64 merge<i64, 8> (i64, i64);
+template u64 merge<u64, 42> (u64, u64);