diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-21 15:40:50 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-21 15:40:50 +0100 |
commit | 474f3938d79ab36b9231c9ad3b5a9314c2aeacde (patch) | |
tree | b26e8627272260dacb911e17d944541d498bd44e | |
parent | 68d7ff0cff0c4905802104843cf0100543b47314 (diff) | |
parent | 14f5d874bcd533054648bb7cc767c7169eaf2f1c (diff) |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jun-21-2019' into staging
MIPS queue for June 21st, 2019
# gpg: Signature made Fri 21 Jun 2019 10:46:57 BST
# gpg: using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65
* remotes/amarkovic/tags/mips-queue-jun-21-2019:
target/mips: Fix emulation of ILVR.<B|H|W> on big endian host
target/mips: Fix emulation of ILVL.<B|H|W> on big endian host
target/mips: Fix emulation of ILVOD.<B|H|W> on big endian host
target/mips: Fix emulation of ILVEV.<B|H|W> on big endian host
tests/tcg: target/mips: Amend tests for MSA pack instructions
tests/tcg: target/mips: Include isa/ase and group name in test output
target/mips: Fix if-else-switch-case arms checkpatch errors in translate.c
target/mips: Fix some space checkpatch errors in translate.c
MAINTAINERS: Consolidate MIPS disassembler-related items
MAINTAINERS: Update file items for MIPS Malta board
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
264 files changed, 2605 insertions, 942 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d32c5c2313..cad58b9487 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -212,9 +212,7 @@ R: Aleksandar Rikalo <arikalo@wavecomp.com> S: Maintained F: target/mips/ F: default-configs/*mips* -F: disas/mips.c -F: disas/nanomips.cpp -F: disas/nanomips.h +F: disas/*mips* F: hw/intc/mips_gic.c F: hw/mips/ F: hw/misc/mips_* @@ -930,6 +928,7 @@ M: Aurelien Jarno <aurelien@aurel32.net> R: Aleksandar Rikalo <arikalo@wavecomp.com> S: Maintained F: hw/mips/mips_malta.c +F: hw/mips/gt64xxx_pci.c F: tests/acceptance/linux_ssh_mips_malta.py Mipssim @@ -2325,7 +2324,6 @@ M: Aurelien Jarno <aurelien@aurel32.net> R: Aleksandar Rikalo <arikalo@wavecomp.com> S: Maintained F: tcg/mips/ -F: disas/mips.c PPC TCG target M: Richard Henderson <rth@twiddle.net> diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index be059a3d6f..7a9bfb3f36 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -1737,6 +1737,24 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, switch (df) { case DF_BYTE: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->b[8] = pws->b[9]; + pwd->b[9] = pwt->b[9]; + pwd->b[10] = pws->b[11]; + pwd->b[11] = pwt->b[11]; + pwd->b[12] = pws->b[13]; + pwd->b[13] = pwt->b[13]; + pwd->b[14] = pws->b[15]; + pwd->b[15] = pwt->b[15]; + pwd->b[0] = pws->b[1]; + pwd->b[1] = pwt->b[1]; + pwd->b[2] = pws->b[3]; + pwd->b[3] = pwt->b[3]; + pwd->b[4] = pws->b[5]; + pwd->b[5] = pwt->b[5]; + pwd->b[6] = pws->b[7]; + pwd->b[7] = pwt->b[7]; +#else pwd->b[15] = pws->b[14]; pwd->b[14] = pwt->b[14]; pwd->b[13] = pws->b[12]; @@ -1753,8 +1771,19 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, pwd->b[2] = pwt->b[2]; pwd->b[1] = pws->b[0]; pwd->b[0] = pwt->b[0]; +#endif break; case DF_HALF: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->h[4] = pws->h[5]; + pwd->h[5] = pwt->h[5]; + pwd->h[6] = pws->h[7]; + pwd->h[7] = pwt->h[7]; + pwd->h[0] = pws->h[1]; + pwd->h[1] = pwt->h[1]; + pwd->h[2] = pws->h[3]; + pwd->h[3] = pwt->h[3]; +#else pwd->h[7] = pws->h[6]; pwd->h[6] = pwt->h[6]; pwd->h[5] = pws->h[4]; @@ -1763,12 +1792,20 @@ void helper_msa_ilvev_df(CPUMIPSState *env, uint32_t df, uint32_t wd, pwd->h[2] = pwt->h[2]; pwd->h[1] = pws->h[0]; pwd->h[0] = pwt->h[0]; +#endif break; case DF_WORD: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->w[2] = pws->w[3]; + pwd->w[3] = pwt->w[3]; + pwd->w[0] = pws->w[1]; + pwd->w[1] = pwt->w[1]; +#else pwd->w[3] = pws->w[2]; pwd->w[2] = pwt->w[2]; pwd->w[1] = pws->w[0]; pwd->w[0] = pwt->w[0]; +#endif break; case DF_DOUBLE: pwd->d[1] = pws->d[0]; @@ -1788,6 +1825,24 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, switch (df) { case DF_BYTE: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->b[7] = pwt->b[6]; + pwd->b[6] = pws->b[6]; + pwd->b[5] = pwt->b[4]; + pwd->b[4] = pws->b[4]; + pwd->b[3] = pwt->b[2]; + pwd->b[2] = pws->b[2]; + pwd->b[1] = pwt->b[0]; + pwd->b[0] = pws->b[0]; + pwd->b[15] = pwt->b[14]; + pwd->b[14] = pws->b[14]; + pwd->b[13] = pwt->b[12]; + pwd->b[12] = pws->b[12]; + pwd->b[11] = pwt->b[10]; + pwd->b[10] = pws->b[10]; + pwd->b[9] = pwt->b[8]; + pwd->b[8] = pws->b[8]; +#else pwd->b[0] = pwt->b[1]; pwd->b[1] = pws->b[1]; pwd->b[2] = pwt->b[3]; @@ -1804,8 +1859,19 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, pwd->b[13] = pws->b[13]; pwd->b[14] = pwt->b[15]; pwd->b[15] = pws->b[15]; +#endif break; case DF_HALF: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->h[3] = pwt->h[2]; + pwd->h[2] = pws->h[2]; + pwd->h[1] = pwt->h[0]; + pwd->h[0] = pws->h[0]; + pwd->h[7] = pwt->h[6]; + pwd->h[6] = pws->h[6]; + pwd->h[5] = pwt->h[4]; + pwd->h[4] = pws->h[4]; +#else pwd->h[0] = pwt->h[1]; pwd->h[1] = pws->h[1]; pwd->h[2] = pwt->h[3]; @@ -1814,12 +1880,20 @@ void helper_msa_ilvod_df(CPUMIPSState *env, uint32_t df, uint32_t wd, pwd->h[5] = pws->h[5]; pwd->h[6] = pwt->h[7]; pwd->h[7] = pws->h[7]; +#endif break; case DF_WORD: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->w[1] = pwt->w[0]; + pwd->w[0] = pws->w[0]; + pwd->w[3] = pwt->w[2]; + pwd->w[2] = pws->w[2]; +#else pwd->w[0] = pwt->w[1]; pwd->w[1] = pws->w[1]; pwd->w[2] = pwt->w[3]; pwd->w[3] = pws->w[3]; +#endif break; case DF_DOUBLE: pwd->d[0] = pwt->d[1]; @@ -1839,6 +1913,24 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, switch (df) { case DF_BYTE: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->b[7] = pwt->b[15]; + pwd->b[6] = pws->b[15]; + pwd->b[5] = pwt->b[14]; + pwd->b[4] = pws->b[14]; + pwd->b[3] = pwt->b[13]; + pwd->b[2] = pws->b[13]; + pwd->b[1] = pwt->b[12]; + pwd->b[0] = pws->b[12]; + pwd->b[15] = pwt->b[11]; + pwd->b[14] = pws->b[11]; + pwd->b[13] = pwt->b[10]; + pwd->b[12] = pws->b[10]; + pwd->b[11] = pwt->b[9]; + pwd->b[10] = pws->b[9]; + pwd->b[9] = pwt->b[8]; + pwd->b[8] = pws->b[8]; +#else pwd->b[0] = pwt->b[8]; pwd->b[1] = pws->b[8]; pwd->b[2] = pwt->b[9]; @@ -1855,8 +1947,19 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, pwd->b[13] = pws->b[14]; pwd->b[14] = pwt->b[15]; pwd->b[15] = pws->b[15]; +#endif break; case DF_HALF: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->h[3] = pwt->h[7]; + pwd->h[2] = pws->h[7]; + pwd->h[1] = pwt->h[6]; + pwd->h[0] = pws->h[6]; + pwd->h[7] = pwt->h[5]; + pwd->h[6] = pws->h[5]; + pwd->h[5] = pwt->h[4]; + pwd->h[4] = pws->h[4]; +#else pwd->h[0] = pwt->h[4]; pwd->h[1] = pws->h[4]; pwd->h[2] = pwt->h[5]; @@ -1865,12 +1968,20 @@ void helper_msa_ilvl_df(CPUMIPSState *env, uint32_t df, uint32_t wd, pwd->h[5] = pws->h[6]; pwd->h[6] = pwt->h[7]; pwd->h[7] = pws->h[7]; +#endif break; case DF_WORD: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->w[1] = pwt->w[3]; + pwd->w[0] = pws->w[3]; + pwd->w[3] = pwt->w[2]; + pwd->w[2] = pws->w[2]; +#else pwd->w[0] = pwt->w[2]; pwd->w[1] = pws->w[2]; pwd->w[2] = pwt->w[3]; pwd->w[3] = pws->w[3]; +#endif break; case DF_DOUBLE: pwd->d[0] = pwt->d[1]; @@ -1890,6 +2001,24 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, switch (df) { case DF_BYTE: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->b[8] = pws->b[0]; + pwd->b[9] = pwt->b[0]; + pwd->b[10] = pws->b[1]; + pwd->b[11] = pwt->b[1]; + pwd->b[12] = pws->b[2]; + pwd->b[13] = pwt->b[2]; + pwd->b[14] = pws->b[3]; + pwd->b[15] = pwt->b[3]; + pwd->b[0] = pws->b[4]; + pwd->b[1] = pwt->b[4]; + pwd->b[2] = pws->b[5]; + pwd->b[3] = pwt->b[5]; + pwd->b[4] = pws->b[6]; + pwd->b[5] = pwt->b[6]; + pwd->b[6] = pws->b[7]; + pwd->b[7] = pwt->b[7]; +#else pwd->b[15] = pws->b[7]; pwd->b[14] = pwt->b[7]; pwd->b[13] = pws->b[6]; @@ -1906,8 +2035,19 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, pwd->b[2] = pwt->b[1]; pwd->b[1] = pws->b[0]; pwd->b[0] = pwt->b[0]; +#endif break; case DF_HALF: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->h[4] = pws->h[0]; + pwd->h[5] = pwt->h[0]; + pwd->h[6] = pws->h[1]; + pwd->h[7] = pwt->h[1]; + pwd->h[0] = pws->h[2]; + pwd->h[1] = pwt->h[2]; + pwd->h[2] = pws->h[3]; + pwd->h[3] = pwt->h[3]; +#else pwd->h[7] = pws->h[3]; pwd->h[6] = pwt->h[3]; pwd->h[5] = pws->h[2]; @@ -1916,12 +2056,20 @@ void helper_msa_ilvr_df(CPUMIPSState *env, uint32_t df, uint32_t wd, pwd->h[2] = pwt->h[1]; pwd->h[1] = pws->h[0]; pwd->h[0] = pwt->h[0]; +#endif break; case DF_WORD: +#if defined(TARGET_WORDS_BIGENDIAN) + pwd->w[2] = pws->w[0]; + pwd->w[3] = pwt->w[0]; + pwd->w[0] = pws->w[1]; + pwd->w[1] = pwt->w[1]; +#else pwd->w[3] = pws->w[1]; pwd->w[2] = pwt->w[1]; pwd->w[1] = pws->w[0]; pwd->w[0] = pwt->w[0]; +#endif break; case DF_DOUBLE: pwd->d[1] = pws->d[0]; diff --git a/target/mips/translate.c b/target/mips/translate.c index a3cf976ab6..e3a0f08dea 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -2617,28 +2617,30 @@ static const char * const mxuregnames[] = { } while (0) /* General purpose registers moves. */ -static inline void gen_load_gpr (TCGv t, int reg) +static inline void gen_load_gpr(TCGv t, int reg) { - if (reg == 0) + if (reg == 0) { tcg_gen_movi_tl(t, 0); - else + } else { tcg_gen_mov_tl(t, cpu_gpr[reg]); + } } -static inline void gen_store_gpr (TCGv t, int reg) +static inline void gen_store_gpr(TCGv t, int reg) { - if (reg != 0) + if (reg != 0) { tcg_gen_mov_tl(cpu_gpr[reg], t); + } } /* Moves to/from shadow registers. */ -static inline void gen_load_srsgpr (int from, int to) +static inline void gen_load_srsgpr(int from, int to) { TCGv t0 = tcg_temp_new(); - if (from == 0) + if (from == 0) { tcg_gen_movi_tl(t0, 0); - else { + } else { TCGv_i32 t2 = tcg_temp_new_i32(); TCGv_ptr addr = tcg_temp_new_ptr(); @@ -2839,16 +2841,18 @@ static void gen_store_fpr64(DisasContext *ctx, TCGv_i64 t, int reg) } } -static inline int get_fp_bit (int cc) +static inline int get_fp_bit(int cc) { - if (cc) + if (cc) { return 24 + cc; - else + } else { return 23; + } } /* Addresses computation */ -static inline void gen_op_addr_add (DisasContext *ctx, TCGv ret, TCGv arg0, TCGv arg1) +static inline void gen_op_addr_add(DisasContext *ctx, TCGv ret, TCGv arg0, + TCGv arg1) { tcg_gen_add_tl(ret, arg0, arg1); @@ -2907,14 +2911,16 @@ static inline void gen_move_high32(TCGv ret, TCGv_i64 arg) static inline void check_cp0_enabled(DisasContext *ctx) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_CP0))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_CP0))) { generate_exception_err(ctx, EXCP_CpU, 0); + } } static inline void check_cp1_enabled(DisasContext *ctx) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_FPU))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_FPU))) { generate_exception_err(ctx, EXCP_CpU, 1); + } } /* Verify that the processor is running with COP1X instructions enabled. @@ -2923,8 +2929,9 @@ static inline void check_cp1_enabled(DisasContext *ctx) static inline void check_cop1x(DisasContext *ctx) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_COP1X))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_COP1X))) { generate_exception_end(ctx, EXCP_RI); + } } /* Verify that the processor is running with 64-bit floating-point @@ -2932,8 +2939,9 @@ static inline void check_cop1x(DisasContext *ctx) static inline void check_cp1_64bitmode(DisasContext *ctx) { - if (unlikely(~ctx->hflags & (MIPS_HFLAG_F64 | MIPS_HFLAG_COP1X))) + if (unlikely(~ctx->hflags & (MIPS_HFLAG_F64 | MIPS_HFLAG_COP1X))) { generate_exception_end(ctx, EXCP_RI); + } } /* @@ -2949,8 +2957,9 @@ static inline void check_cp1_64bitmode(DisasContext *ctx) */ static inline void check_cp1_registers(DisasContext *ctx, int regs) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_F64) && (regs & 1))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_F64) && (regs & 1))) { generate_exception_end(ctx, EXCP_RI); + } } /* Verify that the processor is running with DSP instructions enabled. @@ -3039,8 +3048,9 @@ static inline void check_ps(DisasContext *ctx) instructions are not enabled. */ static inline void check_mips_64(DisasContext *ctx) { - if (unlikely(!(ctx->hflags & MIPS_HFLAG_64))) + if (unlikely(!(ctx->hflags & MIPS_HFLAG_64))) { generate_exception_end(ctx, EXCP_RI); + } } #endif @@ -3125,13 +3135,12 @@ static inline void check_nms(DisasContext *ctx) */ static inline void check_nms_dl_il_sl_tl_l2c(DisasContext *ctx) { - if (unlikely(ctx->CP0_Config5 & (1 << CP0C5_NMS)) && - !(ctx->CP0_Config1 & (1 << CP0C1_DL)) && - !(ctx->CP0_Config1 & (1 << CP0C1_IL)) && - !(ctx->CP0_Config2 & (1 << CP0C2_SL)) && - !(ctx->CP0_Config2 & (1 << CP0C2_TL)) && - !(ctx->CP0_Config5 & (1 << CP0C5_L2C))) - { + if (unlikely((ctx->CP0_Config5 & (1 << CP0C5_NMS)) && + !(ctx->CP0_Config1 & (1 << CP0C1_DL)) && + !(ctx->CP0_Config1 & (1 << CP0C1_IL)) && + !(ctx->CP0_Config2 & (1 << CP0C2_SL)) && + !(ctx->CP0_Config2 & (1 << CP0C2_TL)) && + !(ctx->CP0_Config5 & (1 << CP0C5_L2C)))) { generate_exception_end(ctx, EXCP_RI); } } @@ -3179,23 +3188,56 @@ static inline void gen_cmp ## type ## _ ## fmt(DisasContext *ctx, int n, \ gen_ldcmp_fpr##bits (ctx, fp0, fs); \ gen_ldcmp_fpr##bits (ctx, fp1, ft); \ switch (n) { \ - case 0: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _f, fp0, fp1, cc); break;\ - case 1: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _un, fp0, fp1, cc); break;\ - case 2: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _eq, fp0, fp1, cc); break;\ - case 3: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ueq, fp0, fp1, cc); break;\ - case 4: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _olt, fp0, fp1, cc); break;\ - case 5: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ult, fp0, fp1, cc); break;\ - case 6: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ole, fp0, fp1, cc); break;\ - case 7: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ule, fp0, fp1, cc); break;\ - case 8: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _sf, fp0, fp1, cc); break;\ - case 9: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ngle, fp0, fp1, cc); break;\ - case 10: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _seq, fp0, fp1, cc); break;\ - case 11: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ngl, fp0, fp1, cc); break;\ - case 12: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _lt, fp0, fp1, cc); break;\ - case 13: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _nge, fp0, fp1, cc); break;\ - case 14: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _le, fp0, fp1, cc); break;\ - case 15: gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ngt, fp0, fp1, cc); break;\ - default: abort(); \ + case 0: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _f, fp0, fp1, cc); \ + break; \ + case 1: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _un, fp0, fp1, cc); \ + break; \ + case 2: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _eq, fp0, fp1, cc); \ + break; \ + case 3: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ueq, fp0, fp1, cc); \ + break; \ + case 4: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _olt, fp0, fp1, cc); \ + break; \ + case 5: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ult, fp0, fp1, cc); \ + break; \ + case 6: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ole, fp0, fp1, cc); \ + break; \ + case 7: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ule, fp0, fp1, cc); \ + break; \ + case 8: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _sf, fp0, fp1, cc); \ + break; \ + case 9: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ngle, fp0, fp1, cc); \ + break; \ + case 10: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _seq, fp0, fp1, cc); \ + break; \ + case 11: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ngl, fp0, fp1, cc); \ + break; \ + case 12: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _lt, fp0, fp1, cc); \ + break; \ + case 13: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _nge, fp0, fp1, cc); \ + break; \ + case 14: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _le, fp0, fp1, cc); \ + break; \ + case 15: \ + gen_helper_0e2i(cmp ## type ## _ ## fmt ## _ngt, fp0, fp1, cc); \ + break; \ + default: \ + abort(); \ } \ tcg_temp_free_i##bits (fp0); \ tcg_temp_free_i##bits (fp1); \ @@ -3328,8 +3370,8 @@ OP_LD_ATOMIC(lld,ld64); #endif #undef OP_LD_ATOMIC -static void gen_base_offset_addr (DisasContext *ctx, TCGv addr, - int base, int offset) +static void gen_base_offset_addr(DisasContext *ctx, TCGv addr, + int base, int offset) { if (base == 0) { tcg_gen_movi_tl(addr, offset); @@ -3341,7 +3383,7 @@ static void gen_base_offset_addr (DisasContext *ctx, TCGv addr, } } -static target_ulong pc_relative_pc (DisasContext *ctx) +static target_ulong pc_relative_pc(DisasContext *ctx) { target_ulong pc = ctx->base.pc_next; @@ -3578,8 +3620,8 @@ static void gen_llwp(DisasContext *ctx, uint32_t base, int16_t offset, } /* Store */ -static void gen_st (DisasContext *ctx, uint32_t opc, int rt, - int base, int offset) +static void gen_st(DisasContext *ctx, uint32_t opc, int rt, + int base, int offset) { TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); @@ -3717,8 +3759,8 @@ static void gen_scwp(DisasContext *ctx, uint32_t base, int16_t offset, } /* Load and store */ -static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft, - TCGv t0) +static void gen_flt_ldst(DisasContext *ctx, uint32_t opc, int ft, + TCGv t0) { /* Don't do NOP if destination is zero: we must perform the actual memory access. */ @@ -3881,22 +3923,25 @@ static void gen_logic_imm(DisasContext *ctx, uint32_t opc, uimm = (uint16_t)imm; switch (opc) { case OPC_ANDI: - if (likely(rs != 0)) + if (likely(rs != 0)) { tcg_gen_andi_tl(cpu_gpr[rt], cpu_gpr[rs], uimm); - else + } else { tcg_gen_movi_tl(cpu_gpr[rt], 0); + } break; case OPC_ORI: - if (rs != 0) + if (rs != 0) { tcg_gen_ori_tl(cpu_gpr[rt], cpu_gpr[rs], uimm); - else + } else { tcg_gen_movi_tl(cpu_gpr[rt], uimm); + } break; case OPC_XORI: - if (likely(rs != 0)) + if (likely(rs != 0)) { tcg_gen_xori_tl(cpu_gpr[rt], cpu_gpr[rs], uimm); - else + } else { tcg_gen_movi_tl(cpu_gpr[rt], uimm); + } break; case OPC_LUI: if (rs != 0 && (ctx->insn_flags & ISA_MIPS32R6)) { @@ -5132,8 +5177,8 @@ static void gen_mul_txx9(DisasContext *ctx, uint32_t opc, tcg_temp_free(t1); } -static void gen_mul_vr54xx (DisasContext *ctx, uint32_t opc, - int rd, int rs, int rt) +static void gen_mul_vr54xx(DisasContext *ctx, uint32_t opc, + int rd, int rs, int rt) { TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); @@ -5196,8 +5241,8 @@ static void gen_mul_vr54xx (DisasContext *ctx, uint32_t opc, tcg_temp_free(t1); } -static void gen_cl (DisasContext *ctx, uint32_t opc, - int rd, int rs) +static void gen_cl(DisasContext *ctx, uint32_t opc, + int rd, int rs) { TCGv t0; @@ -6059,8 +6104,9 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc, } out: - if (insn_bytes == 2) + if (insn_bytes == 2) { ctx->hflags |= MIPS_HFLAG_B16; + } tcg_temp_free(t0); tcg_temp_free(t1); } @@ -6188,8 +6234,8 @@ static void gen_compute_branch_nm(DisasContext *ctx, uint32_t opc, /* special3 bitfield operations */ -static void gen_bitops (DisasContext *ctx, uint32_t opc, int rt, - int rs, int lsb, int msb) +static void gen_bitops(DisasContext *ctx, uint32_t opc, int rt, + int rs, int lsb, int msb) { TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); @@ -6259,7 +6305,7 @@ fail: tcg_temp_free(t1); } -static void gen_bshfl (DisasContext *ctx, uint32_t op2, int rt, int rd) +static void gen_bshfl(DisasContext *ctx, uint32_t op2, int rt, int rd) { TCGv t0; @@ -6502,7 +6548,7 @@ static inline void gen_mfhc0_load64(TCGv arg, target_ulong off, int shift) tcg_temp_free_i64(t0); } -static inline void gen_mfc0_load32 (TCGv arg, target_ulong off) +static inline void gen_mfc0_load32(TCGv arg, target_ulong off) { TCGv_i32 t0 = tcg_temp_new_i32(); @@ -6511,13 +6557,13 @@ static inline void gen_mfc0_load32 (TCGv arg, target_ulong off) tcg_temp_free_i32(t0); } -static inline void gen_mfc0_load64 (TCGv arg, target_ulong off) +static inline void gen_mfc0_load64(TCGv arg, target_ulong off) { tcg_gen_ld_tl(arg, cpu_env, off); tcg_gen_ext32s_tl(arg, arg); } -static inline void gen_mtc0_store32 (TCGv arg, target_ulong off) +static inline void gen_mtc0_store32(TCGv arg, target_ulong off) { TCGv_i32 t0 = tcg_temp_new_i32(); @@ -6707,8 +6753,9 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel) { const char *register_name = "invalid"; - if (sel != 0) + if (sel != 0) { check_insn(ctx, ISA_MIPS32); + } switch (reg) { case CP0_REGISTER_00: @@ -7463,8 +7510,9 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel) { const char *register_name = "invalid"; - if (sel != 0) + if (sel != 0) { check_insn(ctx, ISA_MIPS32); + } if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { gen_io_start(); @@ -8209,8 +8257,9 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel) { const char *register_name = "invalid"; - if (sel != 0) + if (sel != 0) { check_insn(ctx, ISA_MIPS64); + } switch (reg) { case CP0_REGISTER_00: @@ -8919,8 +8968,9 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel) { const char *register_name = "invalid"; - if (sel != 0) + if (sel != 0) { check_insn(ctx, ISA_MIPS64); + } if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) { gen_io_start(); @@ -9657,12 +9707,12 @@ static void gen_mftr(CPUMIPSState *env, DisasContext *ctx, int rt, int rd, if ((env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) == 0 && ((env->tcs[other_tc].CP0_TCBind & (0xf << CP0TCBd_CurVPE)) != - (env->active_tc.CP0_TCBind & (0xf << CP0TCBd_CurVPE)))) + (env->active_tc.CP0_TCBind & (0xf << CP0TCBd_CurVPE)))) { tcg_gen_movi_tl(t0, -1); - else if ((env->CP0_VPEControl & (0xff << CP0VPECo_TargTC)) > - (env->mvp->CP0_MVPConf0 & (0xff << CP0MVPC0_PTC))) + } else if ((env->CP0_VPEControl & (0xff << CP0VPECo_TargTC)) > + (env->mvp->CP0_MVPConf0 & (0xff << CP0MVPC0_PTC))) { tcg_gen_movi_tl(t0, -1); - else if (u == 0) { + } else if (u == 0) { switch (rt) { case 1: switch (sel) { @@ -9882,12 +9932,12 @@ static void gen_mttr(CPUMIPSState *env, DisasContext *ctx, int rd, int rt, gen_load_gpr(t0, rt); if ((env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) == 0 && ((env->tcs[other_tc].CP0_TCBind & (0xf << CP0TCBd_CurVPE)) != - (env->active_tc.CP0_TCBind & (0xf << CP0TCBd_CurVPE)))) + (env->active_tc.CP0_TCBind & (0xf << CP0TCBd_CurVPE)))) { /* NOP */ ; - else if ((env->CP0_VPEControl & (0xff << CP0VPECo_TargTC)) > - (env->mvp->CP0_MVPConf0 & (0xff << CP0MVPC0_PTC))) + } else if ((env->CP0_VPEControl & (0xff << CP0VPECo_TargTC)) > + (env->mvp->CP0_MVPConf0 & (0xff << CP0MVPC0_PTC))) { /* NOP */ ; - else if (u == 0) { + } else if (u == 0) { switch (rd) { case 1: switch (sel) { @@ -10077,7 +10127,8 @@ die: generate_exception_end(ctx, EXCP_RI); } -static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt, int rd) +static void gen_cp0(CPUMIPSState *env, DisasContext *ctx, uint32_t opc, + int rt, int rd) { const char *opn = "ldst"; @@ -10160,8 +10211,9 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt, break; case OPC_TLBWI: opn = "tlbwi"; - if (!env->tlb->helper_tlbwi) + if (!env->tlb->helper_tlbwi) { goto die; + } gen_helper_tlbwi(cpu_env); break; case OPC_TLBINV: @@ -10184,20 +10236,23 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt, break; case OPC_TLBWR: opn = "tlbwr"; - if (!env->tlb->helper_tlbwr) + if (!env->tlb->helper_tlbwr) { goto die; + } gen_helper_tlbwr(cpu_env); break; case OPC_TLBP: opn = "tlbp"; - if (!env->tlb->helper_tlbp) + if (!env->tlb->helper_tlbp) { goto die; + } gen_helper_tlbp(cpu_env); break; case OPC_TLBR: opn = "tlbr"; - if (!env->tlb->helper_tlbr) + if (!env->tlb->helper_tlbr) { goto die; + } gen_helper_tlbr(cpu_env); break; case OPC_ERET: /* OPC_ERETNC */ @@ -10271,8 +10326,9 @@ static void gen_compute_branch1(DisasContext *ctx, uint32_t op, goto out; } - if (cc != 0) + if (cc != 0) { check_insn(ctx, ISA_MIPS4 | ISA_MIPS32); + } btarget = ctx->base.pc_next + 4 + offset; @@ -10465,22 +10521,22 @@ enum fopcode { OPC_CVT_W_S = FOP(36, FMT_S), OPC_CVT_L_S = FOP(37, FMT_S), OPC_CVT_PS_S = FOP(38, FMT_S), - OPC_CMP_F_S = FOP (48, FMT_S), - OPC_CMP_UN_S = FOP (49, FMT_S), - OPC_CMP_EQ_S = FOP (50, FMT_S), - OPC_CMP_UEQ_S = FOP (51, FMT_S), - OPC_CMP_OLT_S = FOP (52, FMT_S), - OPC_CMP_ULT_S = FOP (53, FMT_S), - OPC_CMP_OLE_S = FOP (54, FMT_S), - OPC_CMP_ULE_S = FOP (55, FMT_S), - OPC_CMP_SF_S = FOP (56, FMT_S), - OPC_CMP_NGLE_S = FOP (57, FMT_S), - OPC_CMP_SEQ_S = FOP (58, FMT_S), - OPC_CMP_NGL_S = FOP (59, FMT_S), - OPC_CMP_LT_S = FOP (60, FMT_S), - OPC_CMP_NGE_S = FOP (61, FMT_S), - OPC_CMP_LE_S = FOP (62, FMT_S), - OPC_CMP_NGT_S = FOP (63, FMT_S), + OPC_CMP_F_S = FOP(48, FMT_S), + OPC_CMP_UN_S = FOP(49, FMT_S), + OPC_CMP_EQ_S = FOP(50, FMT_S), + OPC_CMP_UEQ_S = FOP(51, FMT_S), + OPC_CMP_OLT_S = FOP(52, FMT_S), + OPC_CMP_ULT_S = FOP(53, FMT_S), + OPC_CMP_OLE_S = FOP(54, FMT_S), + OPC_CMP_ULE_S = FOP(55, FMT_S), + OPC_CMP_SF_S = FOP(56, FMT_S), + OPC_CMP_NGLE_S = FOP(57, FMT_S), + OPC_CMP_SEQ_S = FOP(58, FMT_S), + OPC_CMP_NGL_S = FOP(59, FMT_S), + OPC_CMP_LT_S = FOP(60, FMT_S), + OPC_CMP_NGE_S = FOP(61, FMT_S), + OPC_CMP_LE_S = FOP(62, FMT_S), + OPC_CMP_NGT_S = FOP(63, FMT_S), OPC_ADD_D = FOP(0, FMT_D), OPC_SUB_D = FOP(1, FMT_D), @@ -10521,22 +10577,22 @@ enum fopcode { OPC_CVT_S_D = FOP(32, FMT_D), OPC_CVT_W_D = FOP(36, FMT_D), OPC_CVT_L_D = FOP(37, FMT_D), - OPC_CMP_F_D = FOP (48, FMT_D), - OPC_CMP_UN_D = FOP (49, FMT_D), - OPC_CMP_EQ_D = FOP (50, FMT_D), - OPC_CMP_UEQ_D = FOP (51, FMT_D), - OPC_CMP_OLT_D = FOP (52, FMT_D), - OPC_CMP_ULT_D = FOP (53, FMT_D), - OPC_CMP_OLE_D = FOP (54, FMT_D), - OPC_CMP_ULE_D = FOP (55, FMT_D), - OPC_CMP_SF_D = FOP (56, FMT_D), - OPC_CMP_NGLE_D = FOP (57, FMT_D), - OPC_CMP_SEQ_D = FOP (58, FMT_D), - OPC_CMP_NGL_D = FOP (59, FMT_D), - OPC_CMP_LT_D = FOP (60, FMT_D), - OPC_CMP_NGE_D = FOP (61, FMT_D), - OPC_CMP_LE_D = FOP (62, FMT_D), - OPC_CMP_NGT_D = FOP (63, FMT_D), + OPC_CMP_F_D = FOP(48, FMT_D), + OPC_CMP_UN_D = FOP(49, FMT_D), + OPC_CMP_EQ_D = FOP(50, FMT_D), + OPC_CMP_UEQ_D = FOP(51, FMT_D), + OPC_CMP_OLT_D = FOP(52, FMT_D), + OPC_CMP_ULT_D = FOP(53, FMT_D), + OPC_CMP_OLE_D = FOP(54, FMT_D), + OPC_CMP_ULE_D = FOP(55, FMT_D), + OPC_CMP_SF_D = FOP(56, FMT_D), + OPC_CMP_NGLE_D = FOP(57, FMT_D), + OPC_CMP_SEQ_D = FOP(58, FMT_D), + OPC_CMP_NGL_D = FOP(59, FMT_D), + OPC_CMP_LT_D = FOP(60, FMT_D), + OPC_CMP_NGE_D = FOP(61, FMT_D), + OPC_CMP_LE_D = FOP(62, FMT_D), + OPC_CMP_NGT_D = FOP(63, FMT_D), OPC_CVT_S_W = FOP(32, FMT_W), OPC_CVT_D_W = FOP(33, FMT_W), @@ -10568,22 +10624,22 @@ enum fopcode { OPC_PLU_PS = FOP(45, FMT_PS), OPC_PUL_PS = FOP(46, FMT_PS), OPC_PUU_PS = FOP(47, FMT_PS), - OPC_CMP_F_PS = FOP (48, FMT_PS), - OPC_CMP_UN_PS = FOP (49, FMT_PS), - OPC_CMP_EQ_PS = FOP (50, FMT_PS), - OPC_CMP_UEQ_PS = FOP (51, FMT_PS), - OPC_CMP_OLT_PS = FOP (52, FMT_PS), - OPC_CMP_ULT_PS = FOP (53, FMT_PS), - OPC_CMP_OLE_PS = FOP (54, FMT_PS), - OPC_CMP_ULE_PS = FOP (55, FMT_PS), - OPC_CMP_SF_PS = FOP (56, FMT_PS), - OPC_CMP_NGLE_PS = FOP (57, FMT_PS), - OPC_CMP_SEQ_PS = FOP (58, FMT_PS), - OPC_CMP_NGL_PS = FOP (59, FMT_PS), - OPC_CMP_LT_PS = FOP (60, FMT_PS), - OPC_CMP_NGE_PS = FOP (61, FMT_PS), - OPC_CMP_LE_PS = FOP (62, FMT_PS), - OPC_CMP_NGT_PS = FOP (63, FMT_PS), + OPC_CMP_F_PS = FOP(48, FMT_PS), + OPC_CMP_UN_PS = FOP(49, FMT_PS), + OPC_CMP_EQ_PS = FOP(50, FMT_PS), + OPC_CMP_UEQ_PS = FOP(51, FMT_PS), + OPC_CMP_OLT_PS = FOP(52, FMT_PS), + OPC_CMP_ULT_PS = FOP(53, FMT_PS), + OPC_CMP_OLE_PS = FOP(54, FMT_PS), + OPC_CMP_ULE_PS = FOP(55, FMT_PS), + OPC_CMP_SF_PS = FOP(56, FMT_PS), + OPC_CMP_NGLE_PS = FOP(57, FMT_PS), + OPC_CMP_SEQ_PS = FOP(58, FMT_PS), + OPC_CMP_NGL_PS = FOP(59, FMT_PS), + OPC_CMP_LT_PS = FOP(60, FMT_PS), + OPC_CMP_NGE_PS = FOP(61, FMT_PS), + OPC_CMP_LE_PS = FOP(62, FMT_PS), + OPC_CMP_NGT_PS = FOP(63, FMT_PS), }; enum r6_f_cmp_op { @@ -10633,7 +10689,8 @@ enum r6_f_cmp_op { R6_OPC_CMP_SUNE_D = FOP(26, FMT_L), R6_OPC_CMP_SNE_D = FOP(27, FMT_L), }; -static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs) + +static void gen_cp1(DisasContext *ctx, uint32_t opc, int rt, int fs) { TCGv t0 = tcg_temp_new(); @@ -10714,7 +10771,7 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs) tcg_temp_free(t0); } -static void gen_movci (DisasContext *ctx, int rd, int rs, int cc, int tf) +static void gen_movci(DisasContext *ctx, int rd, int rs, int cc, int tf) { TCGLabel *l1; TCGCond cond; @@ -10725,10 +10782,11 @@ static void gen_movci (DisasContext *ctx, int rd, int rs, int cc, int tf) return; } - if (tf) + if (tf) { cond = TCG_COND_EQ; - else + } else { cond = TCG_COND_NE; + } l1 = gen_new_label(); t0 = tcg_temp_new_i32(); @@ -10750,10 +10808,11 @@ static inline void gen_movcf_s(DisasContext *ctx, int fs, int fd, int cc, TCGv_i32 t0 = tcg_temp_new_i32(); TCGLabel *l1 = gen_new_label(); - if (tf) + if (tf) { cond = TCG_COND_EQ; - else + } else { cond = TCG_COND_NE; + } tcg_gen_andi_i32(t0, fpu_fcr31, 1 << get_fp_bit(cc)); tcg_gen_brcondi_i32(cond, t0, 0, l1); @@ -10763,17 +10822,19 @@ static inline void gen_movcf_s(DisasContext *ctx, int fs, int fd, int cc, tcg_temp_free_i32(t0); } -static inline void gen_movcf_d (DisasContext *ctx, int fs, int fd, int cc, int tf) +static inline void gen_movcf_d(DisasContext *ctx, int fs, int fd, int cc, + int tf) { int cond; TCGv_i32 t0 = tcg_temp_new_i32(); TCGv_i64 fp0; TCGLabel *l1 = gen_new_label(); - if (tf) + if (tf) { cond = TCG_COND_EQ; - else + } else { cond = TCG_COND_NE; + } tcg_gen_andi_i32(t0, fpu_fcr31, 1 << get_fp_bit(cc)); tcg_gen_brcondi_i32(cond, t0, 0, l1); @@ -10793,10 +10854,11 @@ static inline void gen_movcf_ps(DisasContext *ctx, int fs, int fd, TCGLabel *l1 = gen_new_label(); TCGLabel *l2 = gen_new_label(); - if (tf) + if (tf) { cond = TCG_COND_EQ; - else + } else { cond = TCG_COND_NE; + } tcg_gen_andi_i32(t0, fpu_fcr31, 1 << get_fp_bit(cc)); tcg_gen_brcondi_i32(cond, t0, 0, l1); @@ -10886,8 +10948,8 @@ static void gen_sel_d(DisasContext *ctx, enum fopcode op1, int fd, int ft, tcg_temp_free_i64(t1); } -static void gen_farith (DisasContext *ctx, enum fopcode op1, - int ft, int fs, int fd, int cc) +static void gen_farith(DisasContext *ctx, enum fopcode op1, + int ft, int fs, int fd, int cc) { uint32_t func = ctx->opcode & 0x3f; switch (op1) { @@ -12092,8 +12154,9 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1, TCGLabel *l1 = gen_new_label(); TCGv_i64 fp0; - if (ft != 0) + if (ft != 0) { tcg_gen_brcondi_tl(TCG_COND_NE, cpu_gpr[ft], 0, l1); + } fp0 = tcg_temp_new_i64(); gen_load_fpr64(ctx, fp0, fs); gen_store_fpr64(ctx, fp0, fd); @@ -12314,8 +12377,8 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1, } /* Coprocessor 3 (FPU) */ -static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, - int fd, int fs, int base, int index) +static void gen_flt3_ldst(DisasContext *ctx, uint32_t opc, + int fd, int fs, int base, int index) { TCGv t0 = tcg_temp_new(); @@ -12394,8 +12457,8 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc, tcg_temp_free(t0); } -static void gen_flt3_arith (DisasContext *ctx, uint32_t opc, - int fd, int fr, int fs, int ft) +static void gen_flt3_arith(DisasContext *ctx, uint32_t opc, + int fd, int fr, int fs, int ft) { switch (opc) { case OPC_ALNV_PS: @@ -13157,17 +13220,17 @@ enum { RR_RY_CNVT_SEW = 0x6, }; -static int xlat (int r) +static int xlat(int r) { static int map[] = { 16, 17, 2, 3, 4, 5, 6, 7 }; return map[r]; } -static void gen_mips16_save (DisasContext *ctx, - int xsregs, int aregs, - int do_ra, int do_s0, int do_s1, - int framesize) +static void gen_mips16_save(DisasContext *ctx, + int xsregs, int aregs, + int do_ra, int do_s0, int do_s1, + int framesize) { TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); @@ -13322,10 +13385,10 @@ static void gen_mips16_save (DisasContext *ctx, tcg_temp_free(t2); } -static void gen_mips16_restore (DisasContext *ctx, - int xsregs, int aregs, - int do_ra, int do_s0, int do_s1, - int framesize) +static void gen_mips16_restore(DisasContext *ctx, + int xsregs, int aregs, + int do_ra, int do_s0, int do_s1, + int framesize) { int astatic; TCGv t0 = tcg_temp_new(); @@ -13428,8 +13491,8 @@ static void gen_mips16_restore (DisasContext *ctx, tcg_temp_free(t2); } -static void gen_addiupc (DisasContext *ctx, int rx, int imm, - int is_64_bit, int extended) +static void gen_addiupc(DisasContext *ctx, int rx, int imm, + int is_64_bit, int extended) { TCGv t0; @@ -13459,9 +13522,9 @@ static void gen_cache_operation(DisasContext *ctx, uint32_t op, int base, } #if defined(TARGET_MIPS64) -static void decode_i64_mips16 (DisasContext *ctx, - int ry, int funct, int16_t offset, - int extended) +static void decode_i64_mips16(DisasContext *ctx, + int ry, int funct, int16_t offset, + int extended) { switch (funct) { case I64_LDSP: @@ -13520,7 +13583,7 @@ static void decode_i64_mips16 (DisasContext *ctx, } #endif -static int decode_extended_mips16_opc (CPUMIPSState *env, DisasContext *ctx) +static int decode_extended_mips16_opc(CPUMIPSState *env, DisasContext *ctx) { int extend = cpu_lduw_code(env, ctx->base.pc_next + 2); int op, rx, ry, funct, sa; @@ -13734,7 +13797,7 @@ static inline void gen_helper_do_semihosting(void *env) } #endif -static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) +static int decode_mips16_opc(CPUMIPSState *env, DisasContext *ctx) { int rx, ry; int sa; @@ -13957,7 +14020,7 @@ static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) case M16_OPC_LWPC: gen_ld(ctx, OPC_LWPC, rx, 0, ((uint8_t)ctx->opcode) << 2); break; -#if defined (TARGET_MIPS64) +#if defined(TARGET_MIPS64) case M16_OPC_LWU: check_insn(ctx, ISA_MIPS3); check_mips_64(ctx); @@ -14061,7 +14124,7 @@ static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) case RR_SRAV: gen_shift(ctx, OPC_SRAV, ry, rx, ry); break; -#if defined (TARGET_MIPS64) +#if defined(TARGET_MIPS64) case RR_DSRL: check_insn(ctx, ISA_MIPS3); check_mips_64(ctx); @@ -14124,7 +14187,7 @@ static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) case RR_MFLO: gen_HILO(ctx, OPC_MFLO, 0, rx); break; -#if defined (TARGET_MIPS64) +#if defined(TARGET_MIPS64) case RR_DSRA: check_insn(ctx, ISA_MIPS3); check_mips_64(ctx); @@ -14158,7 +14221,7 @@ static int decode_mips16_opc (CPUMIPSState *env, DisasContext *ctx) case RR_DIVU: gen_muldiv(ctx, OPC_DIVU, 0, rx, ry); break; -#if defined (TARGET_MIPS64) +#if defined(TARGET_MIPS64) case RR_DMULT: check_insn(ctx, ISA_MIPS3); check_mips_64(ctx); @@ -14802,7 +14865,7 @@ enum { ADDIUR1SP = 0x1 }; -static int mmreg (int r) +static int mmreg(int r) { static const int map[] = { 16, 17, 2, 3, 4, 5, 6, 7 }; @@ -14810,7 +14873,7 @@ static int mmreg (int r) } /* Used for 16-bit store instructions. */ -static int mmreg2 (int r) +static int mmreg2(int r) { static const int map[] = { 0, 17, 2, 3, 4, 5, 6, 7 }; @@ -14885,8 +14948,8 @@ static void gen_andi16(DisasContext *ctx) gen_logic_imm(ctx, OPC_ANDI, rd, rs, decoded_imm[encoded]); } -static void gen_ldst_multiple (DisasContext *ctx, uint32_t opc, int reglist, - int base, int16_t offset) +static void gen_ldst_multiple(DisasContext *ctx, uint32_t opc, int reglist, + int base, int16_t offset) { TCGv t0, t1; TCGv_i32 t2; @@ -15159,7 +15222,7 @@ static void gen_pool16c_r6_insn(DisasContext *ctx) } } -static void gen_ldxs (DisasContext *ctx, int base, int index, int rd) +static void gen_ldxs(DisasContext *ctx, int base, int index, int rd) { TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); @@ -15179,8 +15242,8 @@ static void gen_ldxs (DisasContext *ctx, int base, int index, int rd) tcg_temp_free(t1); } -static void gen_ldst_pair (DisasContext *ctx, uint32_t opc, int rd, - int base, int16_t offset) +static void gen_ldst_pair(DisasContext *ctx, uint32_t opc, int rd, + int base, int16_t offset) { TCGv t0, t1; @@ -15205,14 +15268,14 @@ static void gen_ldst_pair (DisasContext *ctx, uint32_t opc, int rd, tcg_gen_movi_tl(t1, 4); gen_op_addr_add(ctx, t0, t0, t1); tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_TESL); - gen_store_gpr(t1, rd+1); + gen_store_gpr(t1, rd + 1); break; case SWP: gen_load_gpr(t1, rd); tcg_gen_qemu_st_tl(t1, t0, ctx->mem_idx, MO_TEUL); tcg_gen_movi_tl(t1, 4); gen_op_addr_add(ctx, t0, t0, t1); - gen_load_gpr(t1, rd+1); + gen_load_gpr(t1, rd + 1); tcg_gen_qemu_st_tl(t1, t0, ctx->mem_idx, MO_TEUL); break; #ifdef TARGET_MIPS64 @@ -15226,14 +15289,14 @@ static void gen_ldst_pair (DisasContext *ctx, uint32_t opc, int rd, tcg_gen_movi_tl(t1, 8); gen_op_addr_add(ctx, t0, t0, t1); tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_TEQ); - gen_store_gpr(t1, rd+1); + gen_store_gpr(t1, rd + 1); break; case SDP: gen_load_gpr(t1, rd); tcg_gen_qemu_st_tl(t1, t0, ctx->mem_idx, MO_TEQ); tcg_gen_movi_tl(t1, 8); gen_op_addr_add(ctx, t0, t0, t1); - gen_load_gpr(t1, rd+1); + gen_load_gpr(t1, rd + 1); tcg_gen_qemu_st_tl(t1, t0, ctx->mem_idx, MO_TEQ); break; #endif @@ -15270,7 +15333,7 @@ static void gen_sync(int stype) tcg_gen_mb(tcg_mo); } -static void gen_pool32axf (CPUMIPSState *env, DisasContext *ctx, int rt, int rs) +static void gen_pool32axf(CPUMIPSState *env, DisasContext *ctx, int rt, int rs) { int extension = (ctx->opcode >> 6) & 0x3f; int minor = (ctx->opcode >> 12) & 0xf; @@ -17234,7 +17297,7 @@ static void decode_micromips32_opc(CPUMIPSState *env, DisasContext *ctx) } } -static int decode_micromips_opc (CPUMIPSState *env, DisasContext *ctx) +static int decode_micromips_opc(CPUMIPSState *env, DisasContext *ctx) { uint32_t op; @@ -27881,11 +27944,11 @@ static void gen_check_zero_element(TCGv tresult, uint8_t df, uint8_t wt) eval_big = 0x8000000000000000ULL; break; } - tcg_gen_subi_i64(t0, msa_wr_d[wt<<1], eval_zero_or_big); - tcg_gen_andc_i64(t0, t0, msa_wr_d[wt<<1]); + tcg_gen_subi_i64(t0, msa_wr_d[wt << 1], eval_zero_or_big); + tcg_gen_andc_i64(t0, t0, msa_wr_d[wt << 1]); tcg_gen_andi_i64(t0, t0, eval_big); - tcg_gen_subi_i64(t1, msa_wr_d[(wt<<1)+1], eval_zero_or_big); - tcg_gen_andc_i64(t1, t1, msa_wr_d[(wt<<1)+1]); + tcg_gen_subi_i64(t1, msa_wr_d[(wt << 1) + 1], eval_zero_or_big); + tcg_gen_andc_i64(t1, t1, msa_wr_d[(wt << 1) + 1]); tcg_gen_andi_i64(t1, t1, eval_big); tcg_gen_or_i64(t0, t0, t1); /* if all bits are zero then all elements are not zero */ @@ -27913,7 +27976,7 @@ static void gen_msa_branch(CPUMIPSState *env, DisasContext *ctx, uint32_t op1) case OPC_BNZ_V: { TCGv_i64 t0 = tcg_temp_new_i64(); - tcg_gen_or_i64(t0, msa_wr_d[wt<<1], msa_wr_d[(wt<<1)+1]); + tcg_gen_or_i64(t0, msa_wr_d[wt << 1], msa_wr_d[(wt << 1) + 1]); tcg_gen_setcondi_i64((op1 == OPC_BZ_V) ? TCG_COND_EQ : TCG_COND_NE, t0, t0, 0); tcg_gen_trunc_i64_tl(bcond, t0); @@ -29987,12 +30050,14 @@ void mips_cpu_dump_state(CPUState *cs, FILE *f, int flags) env->active_tc.PC, env->active_tc.HI[0], env->active_tc.LO[0], env->hflags, env->btarget, env->bcond); for (i = 0; i < 32; i++) { - if ((i & 3) == 0) + if ((i & 3) == 0) { qemu_fprintf(f, "GPR%02d:", i); + } qemu_fprintf(f, " %s " TARGET_FMT_lx, regnames[i], env->active_tc.gpr[i]); - if ((i & 3) == 3) + if ((i & 3) == 3) { qemu_fprintf(f, "\n"); + } } qemu_fprintf(f, "CP0 Status 0x%08x Cause 0x%08x EPC 0x" TARGET_FMT_lx "\n", diff --git a/tests/tcg/mips/include/test_utils_128.h b/tests/tcg/mips/include/test_utils_128.h index a828416d4f..2fea6102d1 100644 --- a/tests/tcg/mips/include/test_utils_128.h +++ b/tests/tcg/mips/include/test_utils_128.h @@ -30,11 +30,13 @@ #define PRINT_RESULTS 0 -static inline int32_t check_results(const char *instruction_name, - const uint32_t test_count, - const double elapsed_time, - const uint64_t *b128_result, - const uint64_t *b128_expect) +static inline int32_t check_results_128(const char *isa_ase_name, + const char *group_name, + const char *instruction_name, + const uint32_t test_count, + const double elapsed_time, + const uint64_t *b128_result, + const uint64_t *b128_expect) { #if PRINT_RESULTS uint32_t ii; @@ -56,7 +58,8 @@ static inline int32_t check_results(const char *instruction_name, uint32_t pass_count = 0; uint32_t fail_count = 0; - printf("%s: ", instruction_name); + printf("| %-10s \t| %-20s\t| %-16s \t|", + isa_ase_name, group_name, instruction_name); for (i = 0; i < test_count; i++) { if ((b128_result[2 * i] == b128_expect[2 * i]) && (b128_result[2 * i + 1] == b128_expect[2 * i + 1])) { @@ -66,7 +69,7 @@ static inline int32_t check_results(const char *instruction_name, } } - printf("\tPASS: %3d \tFAIL: %3d \telapsed time: %5.2f ms\n", + printf(" PASS: %3d \t| FAIL: %3d \t| elapsed time: %5.2f ms \t|\n", pass_count, fail_count, elapsed_time); if (fail_count > 0) { diff --git a/tests/tcg/mips/include/test_utils_64.h b/tests/tcg/mips/include/test_utils_64.h index ee3828472c..c9609d8281 100644 --- a/tests/tcg/mips/include/test_utils_64.h +++ b/tests/tcg/mips/include/test_utils_64.h @@ -30,7 +30,9 @@ #define PRINT_RESULTS 0 -static inline int32_t check_results_64(const char *instruction_name, +static inline int32_t check_results_64(const char *isa_ase_name, + const char *group_name, + const char *instruction_name, const uint32_t test_count, const double elapsed_time, const uint64_t *b64_result, @@ -55,7 +57,8 @@ static inline int32_t check_results_64(const char *instruction_name, uint32_t pass_count = 0; uint32_t fail_count = 0; - printf("%s: ", instruction_name); + printf("| %-10s \t| %-20s\t| %-16s \t|", + isa_ase_name, group_name, instruction_name); for (i = 0; i < test_count; i++) { if (b64_result[i] == b64_expect[i]) { pass_count++; @@ -64,7 +67,7 @@ static inline int32_t check_results_64(const char *instruction_name, } } - printf("PASS: %3d FAIL: %3d elapsed time: %5.2f ms\n", + printf(" PASS: %3d \t| FAIL: %3d \t| elapsed time: %5.2f ms \t|\n", pass_count, fail_count, elapsed_time); if (fail_count > 0) { diff --git a/tests/tcg/mips/include/wrappers_msa.h b/tests/tcg/mips/include/wrappers_msa.h index 5d28cb531a..9570aa8998 100644 --- a/tests/tcg/mips/include/wrappers_msa.h +++ b/tests/tcg/mips/include/wrappers_msa.h @@ -555,19 +555,43 @@ DO_MSA__WD__WS_WT(XOR_V, xor.v) */ DO_MSA__WD__WS_WT(PCKEV_B, pckev.b) +DO_MSA__WD__WD_WT(PCKEV_B__DDT, pckev.b) +DO_MSA__WD__WS_WD(PCKEV_B__DSD, pckev.b) DO_MSA__WD__WS_WT(PCKEV_H, pckev.h) +DO_MSA__WD__WD_WT(PCKEV_H__DDT, pckev.h) +DO_MSA__WD__WS_WD(PCKEV_H__DSD, pckev.h) DO_MSA__WD__WS_WT(PCKEV_W, pckev.w) +DO_MSA__WD__WD_WT(PCKEV_W__DDT, pckev.w) +DO_MSA__WD__WS_WD(PCKEV_W__DSD, pckev.w) DO_MSA__WD__WS_WT(PCKEV_D, pckev.d) +DO_MSA__WD__WD_WT(PCKEV_D__DDT, pckev.d) +DO_MSA__WD__WS_WD(PCKEV_D__DSD, pckev.d) DO_MSA__WD__WS_WT(PCKOD_B, pckod.b) +DO_MSA__WD__WD_WT(PCKOD_B__DDT, pckod.b) +DO_MSA__WD__WS_WD(PCKOD_B__DSD, pckod.b) DO_MSA__WD__WS_WT(PCKOD_H, pckod.h) +DO_MSA__WD__WD_WT(PCKOD_H__DDT, pckod.h) +DO_MSA__WD__WS_WD(PCKOD_H__DSD, pckod.h) DO_MSA__WD__WS_WT(PCKOD_W, pckod.w) +DO_MSA__WD__WD_WT(PCKOD_W__DDT, pckod.w) +DO_MSA__WD__WS_WD(PCKOD_W__DSD, pckod.w) DO_MSA__WD__WS_WT(PCKOD_D, pckod.d) +DO_MSA__WD__WD_WT(PCKOD_D__DDT, pckod.d) +DO_MSA__WD__WS_WD(PCKOD_D__DSD, pckod.d) DO_MSA__WD__WS_WT(VSHF_B, vshf.b) +DO_MSA__WD__WD_WT(VSHF_B__DDT, vshf.b) +DO_MSA__WD__WS_WD(VSHF_B__DSD, vshf.b) DO_MSA__WD__WS_WT(VSHF_H, vshf.h) +DO_MSA__WD__WD_WT(VSHF_H__DDT, vshf.h) +DO_MSA__WD__WS_WD(VSHF_H__DSD, vshf.h) DO_MSA__WD__WS_WT(VSHF_W, vshf.w) +DO_MSA__WD__WD_WT(VSHF_W__DDT, vshf.w) +DO_MSA__WD__WS_WD(VSHF_W__DSD, vshf.w) DO_MSA__WD__WS_WT(VSHF_D, vshf.d) +DO_MSA__WD__WD_WT(VSHF_D__DDT, vshf.d) +DO_MSA__WD__WS_WD(VSHF_D__DSD, vshf.d) /* diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_b.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_b.c index 287054e716..6ceb5aab20 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_b.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NLOC.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "NLOC.B"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_d.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_d.c index 171abdf77c..897e90fbbc 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_d.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NLOC.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "NLOC.D"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_h.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_h.c index f260eba7f0..85cf3e6f70 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_h.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NLOC.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "NLOC.H"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_w.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_w.c index cb1981cafc..7ed97be2b4 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_w.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NLOC.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "NLOC.W"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_b.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_b.c index 96d05d59a1..2103d5fbfe 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_b.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NLZC.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "NLZC.B"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_d.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_d.c index c709d5e852..b1ca3d44aa 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_d.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NLZC.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "NLZC.D"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_h.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_h.c index c47e8bfe32..6531c67a86 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_h.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NLZC.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "NLZC.H"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_w.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_w.c index a8a471ba10..71db53c9fe 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_w.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NLZC.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "NLZC.W"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_b.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_b.c index 067a11b48d..184f7f4a49 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_b.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "PCNT.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "PCNT.B"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_d.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_d.c index c60635df70..3cc0d851b2 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_d.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "PCNT.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "PCNT.D"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_h.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_h.c index 8fba20a621..f1052b3c26 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_h.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "PCNT.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "PCNT.H"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_w.c b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_w.c index 24c44aefa1..625ef29406 100644 --- a/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_w.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "PCNT.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Count"; + char *instruction_name = "PCNT.W"; int32_t ret; uint32_t i; struct timeval start, end; @@ -139,8 +141,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_b.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_b.c index e27d3b5f13..56fdee3f31 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BCLR.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BCLR.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_d.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_d.c index 3b8c38494b..0accccf093 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BCLR.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BCLR.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_h.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_h.c index d1db60fb02..474e5297b8 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BCLR.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BCLR.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_w.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_w.c index 54087b7c6e..818b12ff0a 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BCLR.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BCLR.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_b.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_b.c index 733bc24867..78ba32f360 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BNEG.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BNEG.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_d.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_d.c index fc092215d5..44cd608688 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BNEG.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BNEG.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_h.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_h.c index d8347a1884..5d17ceeba3 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BNEG.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BNEG.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_w.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_w.c index 36ef43672f..90d21f453d 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bneg_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BNEG.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BNEG.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_b.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_b.c index f6907cb3d3..8aabf4bb88 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_b.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BSET.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BSET.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_d.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_d.c index ecd833bee0..e3f9a7e4ca 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_d.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BSET.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BSET.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_h.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_h.c index de63f26881..cf9f608180 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_h.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BSET.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BSET.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_w.c b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_w.c index b973e67065..77478116f2 100644 --- a/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_w.c +++ b/tests/tcg/mips/user/ase/msa/bit-set/test_msa_bset_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "BSET.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Bit Set"; + char *instruction_name = "BSET.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mul_q_h.c b/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mul_q_h.c index 39a89ac099..cce7e9e8ac 100644 --- a/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mul_q_h.c +++ b/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mul_q_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MUL_Q.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Fixed Multiply"; + char *instruction_name = "MUL_Q.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mul_q_w.c b/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mul_q_w.c index 07f2daecac..81d2635d7d 100644 --- a/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mul_q_w.c +++ b/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mul_q_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MUL_Q.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Fixed Multiply"; + char *instruction_name = "MUL_Q.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mulr_q_h.c b/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mulr_q_h.c index e35af2fb7e..d5b00f1eb0 100644 --- a/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mulr_q_h.c +++ b/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mulr_q_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MULR_Q.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Fixed Multiply"; + char *instruction_name = "MULR_Q.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mulr_q_w.c b/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mulr_q_w.c index 3cedf672af..78c9e22394 100644 --- a/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mulr_q_w.c +++ b/tests/tcg/mips/user/ase/msa/fixed-multiply/test_msa_mulr_q_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MULR_Q.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Fixed Multiply"; + char *instruction_name = "MULR_Q.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_a_d.c b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_a_d.c index 1807cabdd5..d9b49cea8c 100644 --- a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_a_d.c +++ b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_a_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "FMAX_A.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Float Max Min"; + char *instruction_name = "FMAX_A.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_a_w.c b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_a_w.c index b999b1fdb5..f64276f2f1 100644 --- a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_a_w.c +++ b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_a_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "FMAX_A.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Float Max Min"; + char *instruction_name = "FMAX_A.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_d.c b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_d.c index b5ce6c7543..ba548e4882 100644 --- a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_d.c +++ b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "FMAX.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Float Max Min"; + char *instruction_name = "FMAX.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_w.c b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_w.c index 5fafd3080f..f9aa24d62b 100644 --- a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_w.c +++ b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmax_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "FMAX.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Float Max Min"; + char *instruction_name = "FMAX.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_a_d.c b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_a_d.c index c0b4001eb1..555aa133ae 100644 --- a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_a_d.c +++ b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_a_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "FMIN_A.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Float Max Min"; + char *instruction_name = "FMIN_A.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_a_w.c b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_a_w.c index d174fcd669..9a81f1c6c5 100644 --- a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_a_w.c +++ b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_a_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "FMIN_A.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Float Max Min"; + char *instruction_name = "FMIN_A.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_d.c b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_d.c index 62c149f83a..97123c8c0b 100644 --- a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_d.c +++ b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "FMIN.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Float Max Min"; + char *instruction_name = "FMIN.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_w.c b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_w.c index c5815a66ab..1e91136441 100644 --- a/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_w.c +++ b/tests/tcg/mips/user/ase/msa/float-max-min/test_msa_fmin_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "FMIN.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Float Max Min"; + char *instruction_name = "FMIN.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_b.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_b.c index e96e4fdf72..c0a07b5552 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_b.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADD_A.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADD_A.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_d.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_d.c index ec025b6210..0771cdbdfe 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_d.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADD_A.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADD_A.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_h.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_h.c index d04b3a5abe..7956960d0f 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_h.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADD_A.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADD_A.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_w.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_w.c index 7ae90a3daf..590f440406 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_w.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_add_a_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADD_A.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADD_A.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_b.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_b.c index 05712a1f05..42dd260726 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_b.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_A.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_A.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_d.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_d.c index c222a9529f..3e4e6f7f99 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_d.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_A.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_A.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_h.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_h.c index 0348f8ca47..2901a8174b 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_h.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_A.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_A.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_w.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_w.c index 9ad9c569f8..9e483e0754 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_w.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_a_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_A.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_A.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_b.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_b.c index a7f4de9260..955815bf45 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_d.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_d.c index d1048fcdd5..0795f7e2c5 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_h.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_h.c index 6263616a63..793c5afb8c 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_w.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_w.c index 80b69f70cc..1c72c84669 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_b.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_b.c index d61623fec5..f20340799e 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_d.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_d.c index 7b60457f1d..30249edca0 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_h.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_h.c index c8b226228c..1bd8aa9d20 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_w.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_w.c index 7880b03383..a91c69f624 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_adds_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDS_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDS_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_b.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_b.c index dbfcd3800a..2f11c76aa3 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_b.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDV.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDV.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_d.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_d.c index 27b6d65686..4ed0b97876 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_d.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDV.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDV.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_h.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_h.c index f7045f6151..ca6ddd4b54 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_h.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDV.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDV.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_w.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_w.c index 111e7c89e8..dff0f70a07 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_w.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_addv_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ADDV.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "ADDV.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_d.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_d.c index e6dffbf21f..c50a9dde87 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HADD_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "HADD_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_h.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_h.c index 211123aa9d..586ef923cc 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HADD_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "HADD_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_w.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_w.c index cdab49d7dc..3589c33940 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HADD_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "HADD_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_d.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_d.c index 38c43cedf7..35b2021347 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HADD_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "HADD_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_h.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_h.c index 41863f6cf8..3b38f9bb33 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HADD_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "HADD_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_w.c b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_w.c index c30c2663fc..fd420cb8de 100644 --- a/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-add/test_msa_hadd_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HADD_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Add"; + char *instruction_name = "HADD_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_b.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_b.c index bb73fca1a3..14ee4ab4db 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVE_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVE_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_d.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_d.c index b8c5ab4dc1..ae7b3c8b89 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVE_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVE_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_h.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_h.c index 24aed155f6..d0d327e80f 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVE_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVE_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_w.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_w.c index c0082d1cc4..77010209fb 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVE_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVE_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_b.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_b.c index 8c857c594e..c9e834e74d 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVE_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVE_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_d.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_d.c index fd2a4b9d49..5462ffac0f 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVE_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVE_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_h.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_h.c index 6ab8f47f40..10d57e5741 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVE_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVE_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_w.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_w.c index be614bb238..53106dee74 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_ave_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVE_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVE_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_b.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_b.c index bccb6ac892..465f54fc13 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVER_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVER_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_d.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_d.c index 941d889790..391cb85ff0 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVER_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVER_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_h.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_h.c index b977aaceb4..352b57d786 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVER_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVER_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_w.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_w.c index c41a9b0479..cfba37b0ae 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVER_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVER_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_b.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_b.c index ed9aa28fa0..91f227b830 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVER_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVER_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_d.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_d.c index 04fcea4d2a..fde57a2a5c 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVER_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVER_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_h.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_h.c index 4305010389..b9ec39a3de 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVER_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVER_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_w.c b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_w.c index 47cdc5c08f..dc3c2e432e 100644 --- a/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-average/test_msa_aver_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "AVER_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Average"; + char *instruction_name = "AVER_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_b.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_b.c index 3ffb27c237..c9a9ee227d 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_b.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CEQ.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CEQ.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_d.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_d.c index dc60868c27..542c460f2f 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_d.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CEQ.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CEQ.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_h.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_h.c index a3073d784b..3ebe59550c 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_h.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CEQ.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CEQ.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_w.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_w.c index 9e81665af7..003acf1544 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_w.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_ceq_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CEQ.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CEQ.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_b.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_b.c index 4235d59da7..ff20f0ea0e 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLE_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLE_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_d.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_d.c index 796f89abb7..3dc18bd661 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLE_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLE_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_h.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_h.c index 0b63274022..00c48d657b 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLE_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLE_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_w.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_w.c index 8fcee89221..16f84a13e7 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLE_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLE_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_b.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_b.c index dc50ed3cd8..24574dc30d 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLE_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLE_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_d.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_d.c index f6635f958c..e3f571545d 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLE_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLE_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_h.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_h.c index 0d09304fcb..8938d31c59 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLE_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLE_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_w.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_w.c index 4671eeee7f..078a0c1815 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_cle_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLE_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLE_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_b.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_b.c index 18d5706282..02c3dfa09e 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLT_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLT_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_d.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_d.c index 15a31660d2..40637e2761 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLT_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLT_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_h.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_h.c index 89fcc2cfe6..ee3cd628fc 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLT_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLT_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_w.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_w.c index c8481dfc7a..bde4d95350 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLT_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLT_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_b.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_b.c index ee2b39c687..147bf484b7 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLT_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLT_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_d.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_d.c index 8fef047268..5daf716726 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLT_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLT_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_h.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_h.c index 5b236a7bea..8d51c2cc3c 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLT_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLT_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_w.c b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_w.c index 918420c592..5403af8688 100644 --- a/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-compare/test_msa_clt_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "CLT_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Compare"; + char *instruction_name = "CLT_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_b.c b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_b.c index 1b11d93025..f263201e72 100644 --- a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DIV_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Divide"; + char *instruction_name = "DIV_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_d.c b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_d.c index 289cf6ae3f..0458f933f6 100644 --- a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DIV_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Divide"; + char *instruction_name = "DIV_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_h.c b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_h.c index af10a04352..fffe7be072 100644 --- a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DIV_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Divide"; + char *instruction_name = "DIV_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_w.c b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_w.c index 9d3920bc53..22fa184d80 100644 --- a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DIV_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Divide"; + char *instruction_name = "DIV_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_b.c b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_b.c index 8c0623538f..8097d6c864 100644 --- a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DIV_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Divide"; + char *instruction_name = "DIV_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_d.c b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_d.c index 2a9bfff459..54d6fda1f2 100644 --- a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DIV_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Divide"; + char *instruction_name = "DIV_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_h.c b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_h.c index 95da85b4b9..5a729906ac 100644 --- a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DIV_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Divide"; + char *instruction_name = "DIV_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_w.c b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_w.c index a3984b0790..e9e2da4718 100644 --- a/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-divide/test_msa_div_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DIV_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Divide"; + char *instruction_name = "DIV_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_d.c b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_d.c index e6d72097a6..cb13ff3e75 100644 --- a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DOTP_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Dot Product"; + char *instruction_name = "DOTP_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_h.c b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_h.c index 20a7029bd2..19451ee57d 100644 --- a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DOTP_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Dot Product"; + char *instruction_name = "DOTP_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_w.c b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_w.c index 493fc10cd7..e635888e6c 100644 --- a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DOTP_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Dot Product"; + char *instruction_name = "DOTP_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_d.c b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_d.c index 7c9bd57fa7..af4337d02c 100644 --- a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DOTP_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Dot Product"; + char *instruction_name = "DOTP_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_h.c b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_h.c index 5ca7164718..a87b72b121 100644 --- a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DOTP_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Dot Product"; + char *instruction_name = "DOTP_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_w.c b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_w.c index 271666da05..05df4cb583 100644 --- a/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-dot-product/test_msa_dotp_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "DOTP_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Dot Product"; + char *instruction_name = "DOTP_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_b.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_b.c index eabcd2a5cf..7e984a786e 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_b.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_A.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_A.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_d.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_d.c index 866c6839f2..3dfdb482f4 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_d.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_A.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_A.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_h.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_h.c index 7f4c2406a7..e1d65f98dc 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_h.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_A.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_A.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_w.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_w.c index 7fb278ea02..600f60af56 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_w.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_a_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_A.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_A.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_b.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_b.c index 7e35435e42..ab4161f20c 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_d.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_d.c index f0a341e08a..54a78ae56a 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_h.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_h.c index 52de98ba8f..79b1e0adfd 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_w.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_w.c index b2d0a22ac4..32e32456eb 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_b.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_b.c index 6fb023a4b7..a63d226279 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_d.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_d.c index 35ebf1fdab..815a9ef497 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_h.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_h.c index 0e7cf1e298..b668b39507 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_w.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_w.c index 9dee9973f3..3329455f92 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_max_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MAX_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MAX_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_b.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_b.c index 747f54d0ac..8fdbfc3bd3 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_b.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_A.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_A.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_d.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_d.c index 49ded49fe0..6a9f6bf10e 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_d.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_A.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_A.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_h.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_h.c index f78104ecb6..67a40b96f3 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_h.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_A.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_A.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_w.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_w.c index e0afa01746..d08cb9cea8 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_w.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_a_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_A.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_A.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_b.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_b.c index 248b9681c7..048233bbab 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_d.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_d.c index 219029a520..04e18ebdbf 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_h.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_h.c index fb059af226..3bf32d487a 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_w.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_w.c index dd479921f5..eeb2ec9359 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_b.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_b.c index 7985acf5e4..bdebf68a49 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_d.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_d.c index 45d91af127..fcd90167ed 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_h.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_h.c index eb527bbc2b..16f54b79e1 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_w.c b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_w.c index 057f22accb..574c169d03 100644 --- a/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-max-min/test_msa_min_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MIN_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Max Min"; + char *instruction_name = "MIN_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_b.c b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_b.c index a8964eadf6..1533790cae 100644 --- a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MOD_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Modulo"; + char *instruction_name = "MOD_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_d.c b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_d.c index 3346d37d19..a8237f4244 100644 --- a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MOD_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Modulo"; + char *instruction_name = "MOD_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_h.c b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_h.c index c28c2534f5..5d6e4d63f8 100644 --- a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MOD_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Modulo"; + char *instruction_name = "MOD_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_w.c b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_w.c index 593e516534..1b068f28f5 100644 --- a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MOD_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Modulo"; + char *instruction_name = "MOD_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_b.c b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_b.c index 1b5e57b96f..0d9ddf5907 100644 --- a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MOD_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Modulo"; + char *instruction_name = "MOD_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_d.c b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_d.c index 8aef84325f..1c3aa2bb36 100644 --- a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MOD_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Modulo"; + char *instruction_name = "MOD_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_h.c b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_h.c index ae5abb8e44..a17a69f1f3 100644 --- a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MOD_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Modulo"; + char *instruction_name = "MOD_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_w.c b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_w.c index da48929f4f..ac0f704b18 100644 --- a/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-modulo/test_msa_mod_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MOD_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Modulo"; + char *instruction_name = "MOD_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_b.c b/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_b.c index fa9753cc75..de1046820c 100644 --- a/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_b.c +++ b/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MULV.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Multiply"; + char *instruction_name = "MULV.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_d.c b/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_d.c index 2503467bf2..ae2ebef559 100644 --- a/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_d.c +++ b/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MULV.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Multiply"; + char *instruction_name = "MULV.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_h.c b/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_h.c index 5162678671..27479a82c5 100644 --- a/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_h.c +++ b/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MULV.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Multiply"; + char *instruction_name = "MULV.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_w.c b/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_w.c index 7e2ff6609f..adeb1bfa98 100644 --- a/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_w.c +++ b/tests/tcg/mips/user/ase/msa/int-multiply/test_msa_mulv_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "MULV.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Multiply"; + char *instruction_name = "MULV.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_b.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_b.c index f583702a6b..a3ab83b76c 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ASUB_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "ASUB_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_d.c index a9ae576610..ee46ffadf1 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ASUB_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "ASUB_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_h.c index 8c193b6705..3262365907 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ASUB_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "ASUB_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_w.c index fb8f3c1a10..51f9a69413 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ASUB_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "ASUB_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_b.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_b.c index 506500b993..e086214ef8 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ASUB_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "ASUB_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_d.c index ef7ee3fd15..5640b65007 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ASUB_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "ASUB_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_h.c index 17dab15761..a5bf2d2054 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ASUB_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "ASUB_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_w.c index 38a6395e2d..772e90eedb 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_asub_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "ASUB_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "ASUB_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_d.c index dd1dd37af2..66137f5856 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HSUB_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "HSUB_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_h.c index d725d1957a..e66261b821 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HSUB_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "HSUB_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_w.c index af13d99c0f..6d97abfe3c 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HSUB_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "HSUB_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_d.c index bd71abfc4f..8f39a4525b 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HSUB_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "HSUB_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_h.c index fbf0b6c45c..6cc82fce29 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HSUB_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "HSUB_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_w.c index fb6b91a3a2..b427e87a3a 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_hsub_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "HSUB_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "HSUB_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_b.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_b.c index 38a6f402fd..5c1f810d66 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBS_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBS_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_d.c index 989d27cb4e..546c24c5c2 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBS_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBS_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_h.c index c847a6e6d2..24ddc826c3 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBS_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBS_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_w.c index 0459a4e1af..f6109a5331 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBS_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBS_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_b.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_b.c index 3533c0c3ae..f170912348 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBS_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBS_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_d.c index 894f984f5f..bf647db221 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBS_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBS_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_h.c index 29eea521fd..c4616be3e9 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBS_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBS_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_w.c index 2bae876f11..61052672ca 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subs_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBS_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBS_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_b.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_b.c index 9cb798c405..71ea14fa2d 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_b.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBSUS_U.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBSUS_U.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_d.c index 4915d598fd..070c457c44 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBSUS_U.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBSUS_U.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_h.c index 19d8538942..f98d010436 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBSUS_U.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBSUS_U.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_w.c index 278488bcea..d325c19217 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsus_u_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBSUS_U.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBSUS_U.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_b.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_b.c index a0d7616246..66012b5894 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_b.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBSUU_S.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBSUU_S.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_d.c index 26cf9c5578..344a373055 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBSUU_S.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBSUU_S.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_h.c index cbba316c68..1cacb26395 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBSUU_S.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBSUU_S.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_w.c index 156d62cd65..42f3ee56f6 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subsuu_s_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBSUU_S.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBSUU_S.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_b.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_b.c index dbec0466ef..b8bd085516 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_b.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_b.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBV.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBV.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_d.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_d.c index 8b097899ce..f532e4a69d 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_d.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_d.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBV.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBV.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_h.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_h.c index 69bf9ec7b8..ac7f8ee6b5 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_h.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_h.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBV.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBV.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_w.c b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_w.c index 365dc0ed83..93eeaecc7c 100644 --- a/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_w.c +++ b/tests/tcg/mips/user/ase/msa/int-subtract/test_msa_subv_w.c @@ -35,7 +35,9 @@ int32_t main(void) { - char *instruction_name = "SUBV.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Int Subtract"; + char *instruction_name = "SUBV.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -150,8 +152,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_b.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_b.c index 00b78f7ed4..3506202cd9 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_b.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVEV.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVEV.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_d.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_d.c index a33acfa382..896b11dce0 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_d.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVEV.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVEV.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_h.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_h.c index 51866330dc..a68fea643f 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_h.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVEV.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVEV.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_w.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_w.c index 0e82f2199b..6e168c701e 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_w.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvev_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVEV.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVEV.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_b.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_b.c index 6dc06c597e..11cfbf398a 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_b.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVL.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVL.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_d.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_d.c index a8679723aa..35581ee7ea 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_d.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVL.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVL.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_h.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_h.c index 22f6ba600a..0d89d95edd 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_h.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVL.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVL.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_w.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_w.c index f07689e0c8..ce044889c3 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_w.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvl_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVL.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVL.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_b.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_b.c index 2316f388ec..f7dd1d22b0 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_b.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVOD.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVOD.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_d.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_d.c index 2feb2eb2ed..bef28d8ded 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_d.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVOD.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVOD.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_h.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_h.c index 93abfadfdd..d2355c6676 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_h.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVOD.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVOD.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_w.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_w.c index 9b2b0d82ac..636a62d056 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_w.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvod_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVOD.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVOD.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_b.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_b.c index 105a710d34..75bc9de9f9 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_b.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVR.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVR.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_d.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_d.c index 22579c48c5..a80aa446f8 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_d.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVR.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVR.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_h.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_h.c index ca416c02e6..caa00224fd 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_h.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVR.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVR.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_w.c b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_w.c index 6652c7fbf5..65c89a3712 100644 --- a/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_w.c +++ b/tests/tcg/mips/user/ase/msa/interleave/test_msa_ilvr_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "ILVR.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Interleave"; + char *instruction_name = "ILVR.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/logic/test_msa_and_v.c b/tests/tcg/mips/user/ase/msa/logic/test_msa_and_v.c index 1f864be5f2..22d1f9cc0f 100644 --- a/tests/tcg/mips/user/ase/msa/logic/test_msa_and_v.c +++ b/tests/tcg/mips/user/ase/msa/logic/test_msa_and_v.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "AND.V"; + char *isa_ase_name = "MSA"; + char *group_name = "Logic"; + char *instruction_name = "AND.V"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/logic/test_msa_nor_v.c b/tests/tcg/mips/user/ase/msa/logic/test_msa_nor_v.c index 0b0f5ddb5e..3b9e481582 100644 --- a/tests/tcg/mips/user/ase/msa/logic/test_msa_nor_v.c +++ b/tests/tcg/mips/user/ase/msa/logic/test_msa_nor_v.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "NOR.V"; + char *isa_ase_name = "MSA"; + char *group_name = "Logic"; + char *instruction_name = "NOR.V"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/logic/test_msa_or_v.c b/tests/tcg/mips/user/ase/msa/logic/test_msa_or_v.c index 90f535aa29..e6e5da4efb 100644 --- a/tests/tcg/mips/user/ase/msa/logic/test_msa_or_v.c +++ b/tests/tcg/mips/user/ase/msa/logic/test_msa_or_v.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "OR.V"; + char *isa_ase_name = "MSA"; + char *group_name = "Logic"; + char *instruction_name = "OR.V"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/logic/test_msa_xor_v.c b/tests/tcg/mips/user/ase/msa/logic/test_msa_xor_v.c index 398443d83a..1b699b5ca4 100644 --- a/tests/tcg/mips/user/ase/msa/logic/test_msa_xor_v.c +++ b/tests/tcg/mips/user/ase/msa/logic/test_msa_xor_v.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "XOR.V"; + char *isa_ase_name = "MSA"; + char *group_name = "Logic"; + char *instruction_name = "XOR.V"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_b.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_b.c index fdab88d5c9..4a4c9d6c64 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_b.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_b.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "PCKEV.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "PCKEV.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0xf71a3ffcbe639308ULL, 0xf1d842a04f4d314eULL, }, { 0xd8ff2b145aaacf80ULL, 0xf1d842a04f4d314eULL, }, { 0xf1d842a04f4d314eULL, 0xf1d842a04f4d314eULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKEV_B__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKEV_B__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_d.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_d.c index e7083858cd..67df606aac 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_d.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_d.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "PCKEV.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "PCKEV.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0xfbbe00634d93c708ULL, 0x704f164d5e31e24eULL, }, { 0xac5aaeaab9cf8b80ULL, 0x704f164d5e31e24eULL, }, { 0x704f164d5e31e24eULL, 0x704f164d5e31e24eULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKEV_D__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKEV_D__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_h.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_h.c index bfd401f379..22d043cf49 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_h.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_h.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "PCKEV.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "PCKEV.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0xbb1a52fc0063c708ULL, 0x88d8e2a0164de24eULL, }, { 0xc6ff2514aeaa8b80ULL, 0x88d8e2a0164de24eULL, }, { 0x88d8e2a0164de24eULL, 0x88d8e2a0164de24eULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKEV_H__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKEV_H__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_w.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_w.c index e58372d750..1a9c2df2b8 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_w.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckev_w.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "PCKEV.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "PCKEV.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x153f52fc4d93c708ULL, 0xa942e2a05e31e24eULL, }, { 0xab2b2514b9cf8b80ULL, 0xa942e2a05e31e24eULL, }, { 0xa942e2a05e31e24eULL, 0xa942e2a05e31e24eULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKEV_W__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKEV_W__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_b.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_b.c index 4cefecd0ec..15ef3776ec 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_b.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_b.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "PCKOD.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "PCKOD.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x12bb1552fb004dc7ULL, 0x8d88a9e270165ee2ULL, }, { 0x27c6ab25acaeb98bULL, 0x8d88a9e270165ee2ULL, }, { 0x8d88a9e270165ee2ULL, 0x8d88a9e270165ee2ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKOD_B__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKOD_B__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_d.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_d.c index a7ea137148..e3997cd9a5 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_d.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_d.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "PCKOD.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "PCKOD.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x12f7bb1a153f52fcULL, 0x8df188d8a942e2a0ULL, }, { 0x27d8c6ffab2b2514ULL, 0x8df188d8a942e2a0ULL, }, { 0x8df188d8a942e2a0ULL, 0x8df188d8a942e2a0ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKOD_D__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKOD_D__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_h.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_h.c index bc7edcc595..2a29ac0faf 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_h.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_h.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "PCKOD.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "PCKOD.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x12f7153ffbbe4d93ULL, 0x8df1a942704f5e31ULL, }, { 0x27d8ab2bac5ab9cfULL, 0x8df1a942704f5e31ULL, }, { 0x8df1a942704f5e31ULL, 0x8df1a942704f5e31ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKOD_H__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKOD_H__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_w.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_w.c index ca8c4fb0b6..a3fbe25c6e 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_w.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_pckod_w.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "PCKOD.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "PCKOD.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x12f7bb1afbbe0063ULL, 0x8df188d8704f164dULL, }, { 0x27d8c6ffac5aaeaaULL, 0x8df188d8704f164dULL, }, { 0x8df188d8704f164dULL, 0x8df188d8704f164dULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKOD_W__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_PCKOD_W__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_b.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_b.c index c088643b8c..eedb7d845b 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_b.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_b.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "VSHF.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "VSHF.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x0000000000000000ULL, 0x0000000000000000ULL, }, { 0x8080808080808080ULL, 0x8080808080808080ULL, }, { 0x0000000000000000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_VSHF_B__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_VSHF_B__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_d.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_d.c index 06f3604bef..85a8f0de73 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_d.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_d.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "VSHF.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "VSHF.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x0000000000000000ULL, 0x0000000000000000ULL, }, { 0xac5aaeaab9cf8b80ULL, 0xac5aaeaab9cf8b80ULL, }, { 0x0000000000000000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_VSHF_D__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_VSHF_D__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_h.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_h.c index f28d949d02..8d416bc60b 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_h.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_h.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "VSHF.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "VSHF.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x0000000000000000ULL, 0x0000000000000000ULL, }, { 0x8b808b808b808b80ULL, 0x8b808b808b808b80ULL, }, { 0x0000000000000000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_VSHF_H__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_VSHF_H__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_w.c b/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_w.c index 78e26d4ca0..fd8f02dbd4 100644 --- a/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_w.c +++ b/tests/tcg/mips/user/ase/msa/pack/test_msa_vshf_w.c @@ -28,12 +28,14 @@ #define TEST_COUNT_TOTAL ( \ (PATTERN_INPUTS_SHORT_COUNT) * (PATTERN_INPUTS_SHORT_COUNT) + \ - (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) + 3 * (RANDOM_INPUTS_SHORT_COUNT) * (RANDOM_INPUTS_SHORT_COUNT)) int32_t main(void) { - char *instruction_name = "VSHF.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Pack"; + char *instruction_name = "VSHF.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -121,6 +123,38 @@ int32_t main(void) { 0x0000000000000000ULL, 0x0000000000000000ULL, }, { 0xb9cf8b80b9cf8b80ULL, 0xb9cf8b80b9cf8b80ULL, }, { 0x0000000000000000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 80 */ + { 0x00000000fc000000ULL, 0x000015000000001aULL, }, + { 0x0000000014000000ULL, 0x0000ab00000000ffULL, }, + { 0x00000000a0000000ULL, 0x0000a900000000d8ULL, }, + { 0x000040000000000cULL, 0x9300003f00120000ULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000800000000014ULL, 0x9300003f00120000ULL, }, + { 0x00004e00000000a0ULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0x8800000000fee6aaULL, }, /* 88 */ + { 0x0000000000000000ULL, 0xfb000000001500aaULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x0000000000000000ULL, 0x7000000000a916aaULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 96 */ + { 0x00000800000000fcULL, 0x6200007be64b0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeccULL, }, + { 0x00006a0000550000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x9300003f00120000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae63ULL, }, + { 0x0000be0000c70000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, /* 104 */ + { 0x00000800000000fcULL, 0xcf00002bae270000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abaeaaULL, }, + { 0x00005a00008b0000ULL, 0x0000000000000000ULL, }, + { 0x000000000c000000ULL, 0x0000fe000000005eULL, }, + { 0x00000800000000fcULL, 0x31000042168d0000ULL, }, + { 0x0000000000000000ULL, 0xac00000000abae4dULL, }, + { 0x00004f0000e20000ULL, 0x0000000000000000ULL, }, }; reset_msa_registers(); @@ -143,13 +177,38 @@ int32_t main(void) } } + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_VSHF_W__DDT(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + ((RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + + for (i = 0; i < RANDOM_INPUTS_SHORT_COUNT; i++) { + for (j = 0; j < RANDOM_INPUTS_SHORT_COUNT; j++) { + do_msa_VSHF_W__DSD(b128_random[i], b128_random[j], + b128_result[ + ((PATTERN_INPUTS_SHORT_COUNT) * + (PATTERN_INPUTS_SHORT_COUNT)) + + (2 * (RANDOM_INPUTS_SHORT_COUNT) * + (RANDOM_INPUTS_SHORT_COUNT)) + + RANDOM_INPUTS_SHORT_COUNT * i + j]); + } + } + gettimeofday(&end, NULL); elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_b.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_b.c index 6b1aa962d4..649e67b6a1 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_b.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SLL.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SLL.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_d.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_d.c index deb3b11740..1d6fe54207 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_d.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SLL.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SLL.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_h.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_h.c index edb3b11be5..1e6c27bfe7 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_h.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SLL.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SLL.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_w.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_w.c index 4cafaab334..8bfbaca6fc 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_w.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_sll_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SLL.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SLL.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_b.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_b.c index b1432c2806..a5dcee3a72 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_b.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRA.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRA.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_d.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_d.c index cb6c12dde1..95a13620b9 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_d.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRA.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRA.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_h.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_h.c index 2e505089de..f00003d51c 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_h.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRA.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRA.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_w.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_w.c index f4ba1b5621..f00da6d3d9 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_w.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_sra_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRA.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRA.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_b.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_b.c index 73e60314e5..dcda9c2c95 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_b.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRAR.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRAR.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_d.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_d.c index b784897090..478098acd9 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_d.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRAR.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRAR.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_h.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_h.c index 476d2e1004..a30025548c 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_h.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRAR.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRAR.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_w.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_w.c index 87d717325b..027d4ce565 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_w.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srar_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRAR.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRAR.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_b.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_b.c index e0d460bc00..0e7c453cec 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_b.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRL.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRL.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_d.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_d.c index e4b88a3cc4..f6351f875a 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_d.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRL.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRL.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_h.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_h.c index 1eb64403c2..93394ef47a 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_h.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRL.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRL.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_w.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_w.c index 794833cc15..c18cd9892a 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_w.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srl_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRL.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRL.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_b.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_b.c index 4a900174cc..d173d8fa9c 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_b.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_b.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRLR.B"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRLR.B"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_d.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_d.c index 69ba01f0d9..ecd7bd0c22 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_d.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_d.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRLR.D"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRLR.D"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_h.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_h.c index 514a143a6e..ca7fd75342 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_h.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_h.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRLR.H"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRLR.H"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_w.c b/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_w.c index 940fd6f318..ccbe6c0c84 100644 --- a/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_w.c +++ b/tests/tcg/mips/user/ase/msa/shift/test_msa_srlr_w.c @@ -33,7 +33,9 @@ int32_t main(void) { - char *instruction_name = "SRLR.W"; + char *isa_ase_name = "MSA"; + char *group_name = "Shift"; + char *instruction_name = "SRLR.W"; int32_t ret; uint32_t i, j; struct timeval start, end; @@ -148,8 +150,9 @@ int32_t main(void) elapsed_time = (end.tv_sec - start.tv_sec) * 1000.0; elapsed_time += (end.tv_usec - start.tv_usec) / 1000.0; - ret = check_results(instruction_name, TEST_COUNT_TOTAL, elapsed_time, - &b128_result[0][0], &b128_expect[0][0]); + ret = check_results_128(isa_ase_name, group_name, instruction_name, + TEST_COUNT_TOTAL, elapsed_time, + &b128_result[0][0], &b128_expect[0][0]); return ret; } diff --git a/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_clo.c b/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_clo.c index ca9a739c50..e7ecdc5910 100644 --- a/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_clo.c +++ b/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_clo.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "CLO"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Bit Count"; + char *instruction_name = "CLO"; int32_t ret; uint32_t i; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_clz.c b/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_clz.c index 0a7d21dcbd..a77a8e4eb5 100644 --- a/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_clz.c +++ b/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_clz.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "CLZ"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Bit Count"; + char *instruction_name = "CLZ"; int32_t ret; uint32_t i; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_dclo.c b/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_dclo.c index 72bb473f66..eb41fbdfdf 100644 --- a/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_dclo.c +++ b/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_dclo.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DCLO"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Bit Count"; + char *instruction_name = "DCLO"; int32_t ret; uint32_t i; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_dclz.c b/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_dclz.c index 87df12b36c..be393ac199 100644 --- a/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_dclz.c +++ b/tests/tcg/mips/user/isa/mips64r6/bit-count/test_mips64r6_dclz.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DCLZ"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Bit Count"; + char *instruction_name = "DCLZ"; int32_t ret; uint32_t i; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/bit-swap/test_mips64r6_bitswap.c b/tests/tcg/mips/user/isa/mips64r6/bit-swap/test_mips64r6_bitswap.c index 639850df6a..df3d1b11f6 100644 --- a/tests/tcg/mips/user/isa/mips64r6/bit-swap/test_mips64r6_bitswap.c +++ b/tests/tcg/mips/user/isa/mips64r6/bit-swap/test_mips64r6_bitswap.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "BITSWAP"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Bit Swap"; + char *instruction_name = "BITSWAP"; int32_t ret; uint32_t i; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/bit-swap/test_mips64r6_dbitswap.c b/tests/tcg/mips/user/isa/mips64r6/bit-swap/test_mips64r6_dbitswap.c index 366fe61a95..377835940d 100644 --- a/tests/tcg/mips/user/isa/mips64r6/bit-swap/test_mips64r6_dbitswap.c +++ b/tests/tcg/mips/user/isa/mips64r6/bit-swap/test_mips64r6_dbitswap.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DBITSWAP"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Bit Swap"; + char *instruction_name = "DBITSWAP"; int32_t ret; uint32_t i; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmuh.c b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmuh.c index c049378573..eb21615f95 100644 --- a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmuh.c +++ b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmuh.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DMUH"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Int Multiply"; + char *instruction_name = "DMUH"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmuhu.c b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmuhu.c index dfb41951b1..7316d79e2a 100644 --- a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmuhu.c +++ b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmuhu.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DMUHU"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Int Multiply"; + char *instruction_name = "DMUHU"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmul.c b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmul.c index 3c337dd648..3ac1965cca 100644 --- a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmul.c +++ b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmul.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DMUL"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Int Multiply"; + char *instruction_name = "DMUL"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmulu.c b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmulu.c index b20a1bafc1..0862780e3d 100644 --- a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmulu.c +++ b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_dmulu.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DMULU"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Int Multiply"; + char *instruction_name = "DMULU"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_muh.c b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_muh.c index 91340749b2..ff1ae6fd9c 100644 --- a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_muh.c +++ b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_muh.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "MUH"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Int Multiply"; + char *instruction_name = "MUH"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_muhu.c b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_muhu.c index 24850609c9..cb2752767a 100644 --- a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_muhu.c +++ b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_muhu.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "MUHU"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Int Multiply"; + char *instruction_name = "MUHU"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_mul.c b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_mul.c index acf779c6d9..5cdc4d5632 100644 --- a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_mul.c +++ b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_mul.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "MUL"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Int Multiply"; + char *instruction_name = "MUL"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_mulu.c b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_mulu.c index 65d5803eef..ccb3bdc1ac 100644 --- a/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_mulu.c +++ b/tests/tcg/mips/user/isa/mips64r6/int-multiply/test_mips64r6_mulu.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "MULU"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Int Multiply"; + char *instruction_name = "MULU"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_and.c b/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_and.c index 2039dd9899..4d6cf2e1f1 100644 --- a/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_and.c +++ b/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_and.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "AND"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Logic"; + char *instruction_name = "AND"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_nor.c b/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_nor.c index f22393b6c7..21005ddc53 100644 --- a/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_nor.c +++ b/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_nor.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "NOR"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Logic"; + char *instruction_name = "NOR"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_or.c b/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_or.c index ed8bac1c9c..345b4544fe 100644 --- a/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_or.c +++ b/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_or.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "OR"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Logic"; + char *instruction_name = "OR"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_xor.c b/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_xor.c index a8ba2b4ed1..7e36fee517 100644 --- a/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_xor.c +++ b/tests/tcg/mips/user/isa/mips64r6/logic/test_mips64r6_xor.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "XOR"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Logic"; + char *instruction_name = "XOR"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsllv.c b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsllv.c index b3eb86edb7..4f719efda1 100644 --- a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsllv.c +++ b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsllv.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DSLLV"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Shift"; + char *instruction_name = "DSLLV"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsrav.c b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsrav.c index 025e8f8163..024d508ca8 100644 --- a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsrav.c +++ b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsrav.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DSRAV"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Shift"; + char *instruction_name = "DSRAV"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsrlv.c b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsrlv.c index 680f8a1845..fd1c398ffd 100644 --- a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsrlv.c +++ b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_dsrlv.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "DSRLV"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Shift"; + char *instruction_name = "DSRLV"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_sllv.c b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_sllv.c index 288d087773..a5fa72b727 100644 --- a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_sllv.c +++ b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_sllv.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "SLLV"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Shift"; + char *instruction_name = "SLLV"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_srav.c b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_srav.c index f547d9e408..79e1a047eb 100644 --- a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_srav.c +++ b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_srav.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "SRAV"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Shift"; + char *instruction_name = "SRAV"; int32_t ret; uint32_t i, j; struct timeval start, end; diff --git a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_srlv.c b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_srlv.c index 8b8075ca40..1f8c45d8cc 100644 --- a/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_srlv.c +++ b/tests/tcg/mips/user/isa/mips64r6/shift/test_mips64r6_srlv.c @@ -31,7 +31,9 @@ int32_t main(void) { - char *instruction_name = "SRLV"; + char *isa_ase_name = "mips64r6"; + char *group_name = "Shift"; + char *instruction_name = "SRLV"; int32_t ret; uint32_t i, j; struct timeval start, end; |