OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tcg: Add opcodes for vector nand, nor, eqv

Browse Source 
We've had placeholders for these opcodes for a while,
and should have support on ppc, s390x and avx512 hosts.

Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-12-16 11:17:46 -08:00
parent 0166feda32
commit ed5234735a
10 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/tcg/tcg-opc.h
View File

@ -245,6 +245,9 @@ DEF(or_vec, 1, 2, 0, IMPLVEC)
DEF(xor_vec, 1, 2, 0, IMPLVEC) DEF(xor_vec, 1, 2, 0, IMPLVEC)
DEF(andc_vec, 1, 2, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_andc_vec)) DEF(andc_vec, 1, 2, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_andc_vec))
DEF(orc_vec, 1, 2, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_orc_vec)) DEF(orc_vec, 1, 2, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_orc_vec))
DEF(nand_vec, 1, 2, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_nand_vec))
DEF(nor_vec, 1, 2, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_nor_vec))
DEF(eqv_vec, 1, 2, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_eqv_vec))
DEF(not_vec, 1, 1, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_not_vec)) DEF(not_vec, 1, 1, 0, IMPLVEC | IMPL(TCG_TARGET_HAS_not_vec))
DEF(shli_vec, 1, 1, 1, IMPLVEC | IMPL(TCG_TARGET_HAS_shi_vec)) DEF(shli_vec, 1, 1, 1, IMPLVEC | IMPL(TCG_TARGET_HAS_shi_vec))

3
include/tcg/tcg.h
View File

@ -183,6 +183,9 @@ typedef uint64_t TCGRegSet;
#define TCG_TARGET_HAS_not_vec 0 #define TCG_TARGET_HAS_not_vec 0
#define TCG_TARGET_HAS_andc_vec 0 #define TCG_TARGET_HAS_andc_vec 0
#define TCG_TARGET_HAS_orc_vec 0 #define TCG_TARGET_HAS_orc_vec 0
#define TCG_TARGET_HAS_nand_vec 0
#define TCG_TARGET_HAS_nor_vec 0
#define TCG_TARGET_HAS_eqv_vec 0
#define TCG_TARGET_HAS_roti_vec 0 #define TCG_TARGET_HAS_roti_vec 0
#define TCG_TARGET_HAS_rots_vec 0 #define TCG_TARGET_HAS_rots_vec 0
#define TCG_TARGET_HAS_rotv_vec 0 #define TCG_TARGET_HAS_rotv_vec 0

3
tcg/aarch64/tcg-target.h
View File

@ -131,6 +131,9 @@ typedef enum {
#define TCG_TARGET_HAS_andc_vec 1 #define TCG_TARGET_HAS_andc_vec 1
#define TCG_TARGET_HAS_orc_vec 1 #define TCG_TARGET_HAS_orc_vec 1
#define TCG_TARGET_HAS_nand_vec 0
#define TCG_TARGET_HAS_nor_vec 0
#define TCG_TARGET_HAS_eqv_vec 0
#define TCG_TARGET_HAS_not_vec 1 #define TCG_TARGET_HAS_not_vec 1
#define TCG_TARGET_HAS_neg_vec 1 #define TCG_TARGET_HAS_neg_vec 1
#define TCG_TARGET_HAS_abs_vec 1 #define TCG_TARGET_HAS_abs_vec 1

3
tcg/arm/tcg-target.h
View File

@ -130,6 +130,9 @@ extern bool use_neon_instructions;
#define TCG_TARGET_HAS_andc_vec 1 #define TCG_TARGET_HAS_andc_vec 1
#define TCG_TARGET_HAS_orc_vec 1 #define TCG_TARGET_HAS_orc_vec 1
#define TCG_TARGET_HAS_nand_vec 0
#define TCG_TARGET_HAS_nor_vec 0
#define TCG_TARGET_HAS_eqv_vec 0
#define TCG_TARGET_HAS_not_vec 1 #define TCG_TARGET_HAS_not_vec 1
#define TCG_TARGET_HAS_neg_vec 1 #define TCG_TARGET_HAS_neg_vec 1
#define TCG_TARGET_HAS_abs_vec 1 #define TCG_TARGET_HAS_abs_vec 1

3
tcg/i386/tcg-target.h
View File

@ -185,6 +185,9 @@ extern bool have_movbe;
#define TCG_TARGET_HAS_andc_vec 1 #define TCG_TARGET_HAS_andc_vec 1
#define TCG_TARGET_HAS_orc_vec 0 #define TCG_TARGET_HAS_orc_vec 0
#define TCG_TARGET_HAS_nand_vec 0
#define TCG_TARGET_HAS_nor_vec 0
#define TCG_TARGET_HAS_eqv_vec 0
#define TCG_TARGET_HAS_not_vec 0 #define TCG_TARGET_HAS_not_vec 0
#define TCG_TARGET_HAS_neg_vec 0 #define TCG_TARGET_HAS_neg_vec 0
#define TCG_TARGET_HAS_abs_vec 1 #define TCG_TARGET_HAS_abs_vec 1

12
tcg/optimize.c
View File

@ -359,13 +359,13 @@ static uint64_t do_constant_folding_2(TCGOpcode op, uint64_t x, uint64_t y)
CASE_OP_32_64_VEC(orc): CASE_OP_32_64_VEC(orc):
return x | ~y; return x | ~y;
CASE_OP_32_64(eqv): CASE_OP_32_64_VEC(eqv):
return ~(x ^ y); return ~(x ^ y);
CASE_OP_32_64(nand): CASE_OP_32_64_VEC(nand):
return ~(x & y); return ~(x & y);
CASE_OP_32_64(nor): CASE_OP_32_64_VEC(nor):
return ~(x | y); return ~(x | y);
case INDEX_op_clz_i32: case INDEX_op_clz_i32:
@ -2119,7 +2119,7 @@ void tcg_optimize(TCGContext *s)
case INDEX_op_dup2_vec: case INDEX_op_dup2_vec:
done = fold_dup2(&ctx, op); done = fold_dup2(&ctx, op);
break; break;
CASE_OP_32_64(eqv): CASE_OP_32_64_VEC(eqv):
done = fold_eqv(&ctx, op); done = fold_eqv(&ctx, op);
break; break;
CASE_OP_32_64(extract): CASE_OP_32_64(extract):
@ -2170,13 +2170,13 @@ void tcg_optimize(TCGContext *s)
CASE_OP_32_64(mulu2): CASE_OP_32_64(mulu2):
done = fold_multiply2(&ctx, op); done = fold_multiply2(&ctx, op);
break; break;
CASE_OP_32_64(nand): CASE_OP_32_64_VEC(nand):
done = fold_nand(&ctx, op); done = fold_nand(&ctx, op);
break; break;
CASE_OP_32_64(neg): CASE_OP_32_64(neg):
done = fold_neg(&ctx, op); done = fold_neg(&ctx, op);
break; break;
CASE_OP_32_64(nor): CASE_OP_32_64_VEC(nor):
done = fold_nor(&ctx, op); done = fold_nor(&ctx, op);
break; break;
CASE_OP_32_64_VEC(not): CASE_OP_32_64_VEC(not):

3
tcg/ppc/tcg-target.h
View File

@ -162,6 +162,9 @@ extern bool have_vsx;
#define TCG_TARGET_HAS_andc_vec 1 #define TCG_TARGET_HAS_andc_vec 1
#define TCG_TARGET_HAS_orc_vec have_isa_2_07 #define TCG_TARGET_HAS_orc_vec have_isa_2_07
#define TCG_TARGET_HAS_nand_vec 0
#define TCG_TARGET_HAS_nor_vec 0
#define TCG_TARGET_HAS_eqv_vec 0
#define TCG_TARGET_HAS_not_vec 1 #define TCG_TARGET_HAS_not_vec 1
#define TCG_TARGET_HAS_neg_vec have_isa_3_00 #define TCG_TARGET_HAS_neg_vec have_isa_3_00
#define TCG_TARGET_HAS_abs_vec 0 #define TCG_TARGET_HAS_abs_vec 0

3
tcg/s390x/tcg-target.h
View File

@ -145,6 +145,9 @@ extern uint64_t s390_facilities[3];
#define TCG_TARGET_HAS_andc_vec 1 #define TCG_TARGET_HAS_andc_vec 1
#define TCG_TARGET_HAS_orc_vec HAVE_FACILITY(VECTOR_ENH1) #define TCG_TARGET_HAS_orc_vec HAVE_FACILITY(VECTOR_ENH1)
#define TCG_TARGET_HAS_nand_vec 0
#define TCG_TARGET_HAS_nor_vec 0
#define TCG_TARGET_HAS_eqv_vec 0
#define TCG_TARGET_HAS_not_vec 1 #define TCG_TARGET_HAS_not_vec 1
#define TCG_TARGET_HAS_neg_vec 1 #define TCG_TARGET_HAS_neg_vec 1
#define TCG_TARGET_HAS_abs_vec 1 #define TCG_TARGET_HAS_abs_vec 1

27
tcg/tcg-op-vec.c
View File

@ -371,23 +371,32 @@ void tcg_gen_orc_vec(unsigned vece, TCGv_vec r, TCGv_vec a, TCGv_vec b)
void tcg_gen_nand_vec(unsigned vece, TCGv_vec r, TCGv_vec a, TCGv_vec b) void tcg_gen_nand_vec(unsigned vece, TCGv_vec r, TCGv_vec a, TCGv_vec b)
{ {
/* TODO: Add TCG_TARGET_HAS_nand_vec when adding a backend supports it. */ if (TCG_TARGET_HAS_nand_vec) {
tcg_gen_and_vec(0, r, a, b); vec_gen_op3(INDEX_op_nand_vec, 0, r, a, b);
tcg_gen_not_vec(0, r, r); } else {
tcg_gen_and_vec(0, r, a, b);
tcg_gen_not_vec(0, r, r);
}
} }
void tcg_gen_nor_vec(unsigned vece, TCGv_vec r, TCGv_vec a, TCGv_vec b) void tcg_gen_nor_vec(unsigned vece, TCGv_vec r, TCGv_vec a, TCGv_vec b)
{ {
/* TODO: Add TCG_TARGET_HAS_nor_vec when adding a backend supports it. */ if (TCG_TARGET_HAS_nor_vec) {
tcg_gen_or_vec(0, r, a, b); vec_gen_op3(INDEX_op_nor_vec, 0, r, a, b);
tcg_gen_not_vec(0, r, r); } else {
tcg_gen_or_vec(0, r, a, b);
tcg_gen_not_vec(0, r, r);
}
} }
void tcg_gen_eqv_vec(unsigned vece, TCGv_vec r, TCGv_vec a, TCGv_vec b) void tcg_gen_eqv_vec(unsigned vece, TCGv_vec r, TCGv_vec a, TCGv_vec b)
{ {
/* TODO: Add TCG_TARGET_HAS_eqv_vec when adding a backend supports it. */ if (TCG_TARGET_HAS_eqv_vec) {
tcg_gen_xor_vec(0, r, a, b); vec_gen_op3(INDEX_op_eqv_vec, 0, r, a, b);
tcg_gen_not_vec(0, r, r); } else {
tcg_gen_xor_vec(0, r, a, b);
tcg_gen_not_vec(0, r, r);
}
} }
static bool do_op2(unsigned vece, TCGv_vec r, TCGv_vec a, TCGOpcode opc) static bool do_op2(unsigned vece, TCGv_vec r, TCGv_vec a, TCGOpcode opc)

6
tcg/tcg.c
View File

@ -1407,6 +1407,12 @@ bool tcg_op_supported(TCGOpcode op)
return have_vec && TCG_TARGET_HAS_andc_vec; return have_vec && TCG_TARGET_HAS_andc_vec;
case INDEX_op_orc_vec: case INDEX_op_orc_vec:
return have_vec && TCG_TARGET_HAS_orc_vec; return have_vec && TCG_TARGET_HAS_orc_vec;
case INDEX_op_nand_vec:
return have_vec && TCG_TARGET_HAS_nand_vec;
case INDEX_op_nor_vec:
return have_vec && TCG_TARGET_HAS_nor_vec;
case INDEX_op_eqv_vec:
return have_vec && TCG_TARGET_HAS_eqv_vec;
case INDEX_op_mul_vec: case INDEX_op_mul_vec:
return have_vec && TCG_TARGET_HAS_mul_vec; return have_vec && TCG_TARGET_HAS_mul_vec;
case INDEX_op_shli_vec: case INDEX_op_shli_vec: