diff --git a/MAINTAINERS b/MAINTAINERS index d32c5c231329c76b038c8479e0516b4fa5af6b1b..cad58b948791d9e27532053a4d72688cada3fd4d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -212,9 +212,7 @@ R: Aleksandar Rikalo 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 R: Aleksandar Rikalo 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 R: Aleksandar Rikalo S: Maintained F: tcg/mips/ -F: disas/mips.c PPC TCG target M: Richard Henderson diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index be059a3d6f2aaa274aa6af275f830da196ec4ae6..7a9bfb3f366cf63c0cbab5733217bbf39c869e34 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 a3cf976ab6508335beff9b1f18e134ee2dcbf2ed..e3a0f08dea6dda708781bc25a177e5d05d499215 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 a828416d4f9685c5e2fff8a4a44d736d32297e3e..2fea6102d1ea52a620d3f5d59acf66ebd017680a 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 ee3828472c270db2bf7779220df6960c111c08c7..c9609d8281f6cb23242ac914b4c91010aac1d827 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 5d28cb531a2d7e2a8511083dc3d00bd3227cf6d9..9570aa8998fa1ed24c8820a91f844980391a82d2 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 287054e716667cf66027121d9d290539e548145a..6ceb5aab20ceb171acbae773643c3ddea28ca4ec 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 171abdf77c7c1482e5d9e919c1022c28fcd5bdb8..897e90fbbc9c50e40506a32e954bf2c6a481c529 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 f260eba7f0896067e4e973a4d0b7d8dafd121f75..85cf3e6f702a44c7d1387d9a92415c10b9930cfa 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 cb1981cafc0aa7b928f6f507055a07e147b7c91a..7ed97be2b482fab5a3d0329174047d2d374b151e 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 96d05d59a1cd0c319f5c2696725c95f9050c61fa..2103d5fbfea5e7f529a99a9c25c9ca87f62ce317 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 c709d5e852353101b4582b7906ce669a5f56287b..b1ca3d44aacd50f72ecf8cefd8eacd169f1178c4 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 c47e8bfe3269c93a7e42b45642f7d3858abb5604..6531c67a86911d997e8aa3c63f14f3418d5c793b 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 a8a471ba102fbed5c9a18a59cd0af7e9ea3fcbc9..71db53c9fe489bc662b163917d0c9387ece95fa2 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 067a11b48d2f34bc053f050a0be614f2382bd352..184f7f4a4987b3eb48673d6763ef9255c1994ddb 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 c60635df7068b15855ecb4c89bea57e430381af2..3cc0d851b291d48b522c45d8ad12bbd7753dad13 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 8fba20a62173bb7ca5ca8b16ff0d29cad4c7bb08..f1052b3c26a39a2d5d0c9cecef7981e64777a786 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 24c44aefa17e65604824e273b5136dd15928fd40..625ef29406b7c8224e703d4f00b6fc0295d7636e 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 e27d3b5f137a7c5af552e57c00e623ebdf14ca7c..56fdee3f31e4e490cdfec880cef23c4d1ed1c051 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 3b8c38494bc19c6027bcade1b941380ea80db314..0accccf093caa0a99c071f374bd22efe0f25f968 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 d1db60fb02403d62a5d99237b01c1d52750454ce..474e5297b8d3de9e4493227199708082e77b5a4f 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 54087b7c6eba3a59d4dfb8dab4fca51db9d83b4b..818b12ff0acf2a1a7d8610a41f90cc1b237bbc97 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 733bc24867cbb2703ffbfdd1d31dcab7ad82bec8..78ba32f360968dda3b67fb5c97331c969518c191 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 fc092215d5ee247d391af0944293b685e267be9d..44cd608688c846ae76c636e89540fe333227e836 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 d8347a1884f61720caafa2bf94c31a2cace312a3..5d17ceeba3e055ea3289790ff7a51daf580ee5cc 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 36ef43672fb29e5bf997f5abdb61a0b99b936574..90d21f453d154862c2ec34188877fb5119a5242f 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 f6907cb3d315d22f46a95ba5938dcaa17e4ba6e1..8aabf4bb880a0a27fbcf407da96e6add8231908a 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 ecd833bee092174fa827a1bdbf5db7dcdc3a0dbc..e3f9a7e4ca4be4bc9227269f7bdded3583cede59 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 de63f268819d5f78c780a6f3d3b850935385b93d..cf9f6081800ea9fcb0289f33fa4a97c4e9610ee9 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 b973e6706502e613add157db4c965b7a77fbc717..77478116f26fb92ae4877a728134ae9c472fb84c 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 39a89ac099e19f989a56479ba042d827da8ea31a..cce7e9e8ac2393495d734c76d844e6da73a930e4 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 07f2daecacb9cb4994241c324fce68f9fc0617d9..81d2635d7d5bf39e5e1e0087ecf30b26cbf8bd85 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 e35af2fb7e4190b179d265e9734c9c51ffa1a4fe..d5b00f1eb0a09c00c5223b336edef1b24203d1fc 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 3cedf672aff68bedeaa3fd1f167716632559d75c..78c9e223944fe86514c199448f10d596e89df13f 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 1807cabdd5362bf5a637e6d16d7d84ee64431a42..d9b49cea8cb6a42e5ecb6aeafdd73d8c086e72fd 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 b999b1fdb54efc0bff8105fc3d331bafb1d6c83b..f64276f2f139b076226e3d784843591b596316ab 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 b5ce6c754322894bcf2da3ca448957571f481d67..ba548e488249787f5acc6b16b3d4543fe53fc375 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 5fafd3080fdbde198d967d61bbca61fc0e7820cd..f9aa24d62bfa8a0280d3760bf3b6d57bec39db93 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 c0b4001eb1130b18cfd8b01065c130ade0f5268c..555aa133ae9cf9db255b1d6f610cd00b8a31468c 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 d174fcd66951591f690c5e77a2b77224d7770f71..9a81f1c6c5de89faf4b67ba71ca54b79405b5c1c 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 62c149f83a7e71c842bd8073c0b8d8896bee4d0d..97123c8c0b2fa23692748672ae6d77b03f7ae3dc 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 c5815a66abb373a71a0a47dd7b29aa430c06d611..1e91136441bb7441aa7ff222c5ef9d63f8790e13 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 e96e4fdf72881aeb518237c10358e873e04ac767..c0a07b5552d58d3467d1a98276d490fb31edac26 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 ec025b62100848d32cbf5d85f283d747fc68ff13..0771cdbdfe95d6844bffddc81c58b994be0eadb6 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 d04b3a5abed8c28af4617504d07406715635d0a3..7956960d0f89d28fa3e961e06000c2c743758e6f 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 7ae90a3daf49e7b87e22058c31bc73c1cc8c3f04..590f440406b112d6860faec5aa7fead03b89d0ee 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 05712a1f055d216fd076e290f8cbd7d841ca450e..42dd260726f43b1b27b581a6fc51f4e97046c5c9 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 c222a9529fbcba0d086e585141655fa5f187b4ec..3e4e6f7f991747af3db106203daaafea56859484 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 0348f8ca475d581a49ed718d477f2dd3fe54afed..2901a8174b7db34a6880a18f86cc78ccbfe5a390 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 9ad9c569f85631e742c043b9b5a2a9eb652283fc..9e483e07546a63d09be8ccc951ef8de449d08dc1 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 a7f4de926075969ac5a14f231ca0b68ce90a9f57..955815bf451b47ba21e1efc759eae032cfc60ff6 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 d1048fcdd5c6283ac5c5d2a219c8c159a2962e0d..0795f7e2c518dd9b768f7626bbd16adad98c80fc 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 6263616a63e668bffe5893b5f76919c8b7a54867..793c5afb8ca24dcf033627647d82cf7272fa4693 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 80b69f70cc785ab1c4732e2820282a764e31ab57..1c72c8466921fa7026b6d5545ebc2c4955a6345a 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 d61623fec51844c74c8c6c2969049178a53236de..f20340799e0dc6be1a6aa2c34bbfe5289e6af71f 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 7b60457f1d6dd9c7bc0d730d56e26b1d1c7df190..30249edca00536da7ba18eaaf2a836aba2d1913f 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 c8b226228cf58e050b7c474cf5ddcd9ab9b85e49..1bd8aa9d20bd23f7e7adabc1529b06ba88ce0370 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 7880b033833d6be60a715eb2cc65e2456d7575d0..a91c69f6249f642d82c678bfa69074cb47a09bae 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 dbfcd3800a1ecdeb45c41dca9547a029699b9c83..2f11c76aa37e4b4552b1e4946432804489149679 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 27b6d65686449f489abf3b4288a75b488d570526..4ed0b97876a77a6c060d533084d6bea379ca563a 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 f7045f6151226f7f4ada11bae50eb1ebff584996..ca6ddd4b540d093b6894308187aac7c7170a4308 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 111e7c89e8f9daaf9a61d4d5c9e8417170376173..dff0f70a07541f43a7a1123bd42d4aad17afeb9c 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 e6dffbf21fe011a5ed3597fa665a0e8f9630eab6..c50a9dde8753086a5301e44f49dd5532f6279fdd 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 211123aa9d164b9bad71d0004e44f0e4793cae06..586ef923ccf0d6e95d8d795f2227121cba8bb538 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 cdab49d7dca7ec9a22f39960d8808901f15cbe34..3589c33940d03c562a55199f5c1c8d7555a5855f 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 38c43cedf76b73fa9de54e3e29c73a1ea0e30780..35b2021347a4be00e5b23df2a77cccac2f5d9230 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 41863f6cf86321d92652b3dbbff10c4ba98969b2..3b38f9bb33f800a0fa1ecfabe572f6e935cb5c0e 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 c30c2663fcb1504c33a9eed95bb1da27a1feb1b9..fd420cb8de7ad166014339f58422fd55cfe01aac 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 bb73fca1a38c2878b84015d938ee5433a17bf826..14ee4ab4db91d1df349ed231ff5fa4fda2d0ed62 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 b8c5ab4dc10b6ee2d4ef858b6d7c6d870efcd055..ae7b3c8b89226cd911ca08b276e9b797dbffacf1 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 24aed155f69d2fdd5bad983be09b4e4448c53377..d0d327e80f084335e3e4e539003f36e8b11d1f0d 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 c0082d1cc4e106464f37d7cd0b56a4dbcdb740f1..77010209fb8bcb06837ae310b9865ff67393a338 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 8c857c594e7d92dd5168e38fb12c702268383ac7..c9e834e74d654f5322c1a221909113434de37e54 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 fd2a4b9d49308efccb4e743969009039d8c8e41b..5462ffac0f3ff4bc7c8e418b9fda33d771ece5f2 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 6ab8f47f402aa29e2ff5c99457e21cdef2f29035..10d57e5741a8c9e17f83c19d4747c2e907cecb28 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 be614bb238749c1bb572c79ab2cb4ea435d6a93a..53106dee74f0d9a8934363ef5d152b505e92c02c 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 bccb6ac892fe52e3c7c9c4933a0e348fe0e7a3b7..465f54fc1376d223e34ca198265940590f21f19c 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 941d889790e491d0387c336aa804d00f36fd06b1..391cb85ff0b333fb2b92c5dfd5fd830ca3fec9d9 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 b977aaceb4091be7fe79da4c6a8ea845fdb5a2bd..352b57d786a906d785c172d1451ac42f1ae0f624 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 c41a9b04790b291e300850561abc26639c1af92c..cfba37b0ae240e02e2bb187bf469e83029ba53ff 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 ed9aa28fa0e6facac5fac3a89e82d6ff57bda87e..91f227b830eb42ca64ef1607a09ce9ff292a8d09 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 04fcea4d2a65cb1b128373183a00167a0950ca6e..fde57a2a5c2d142d1a7868f04ddb995d1a24182c 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 430501038976bcffd6e2f1f5935bf96b9ebd4efb..b9ec39a3dee14ee56405933a4ecf581c57f6b31a 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 47cdc5c08f3b4cb964de73ba4330d9a25d6b1aca..dc3c2e432edcdeb8d42ec420b63daebef8dd11db 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 3ffb27c237002c5b578903c48d9f5f0ee891626b..c9a9ee227da084e15d4605edee7221a4697919ee 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 dc60868c2779ef0263407f3238c591231a5b24ba..542c460f2fa8f1922a9c116ee20b4cc3759c189d 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 a3073d784b71be79e84334521f4d308d334361a3..3ebe59550c3aa99737d1a1c5c6a482087efcb2f8 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 9e81665af714d8808c797c553486c82e3eda6c34..003acf154459967639acb992c52f2025e1c88f97 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 4235d59da753695718bc3f20eabb8fdce6f92b37..ff20f0ea0efddff29dc99f7af2bf36bc38d441ff 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 796f89abb731bfe02848d3c59cb4d1dafe32c367..3dc18bd6612ca41e82774149363c08fd1b309275 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 0b6327402278a62e6be76f038832f5b6ea54ab9a..00c48d657bba0ada9f15e581dff44be6f67c08a5 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 8fcee89221e543950ea15db25628035e935cd0cb..16f84a13e7d7181c503d77a429dd13da5b009d2d 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 dc50ed3cd83d02d7663f2346fd9b935711fe2c4c..24574dc30d7a94d5d5e27f0128e926f49e576559 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 f6635f958c5e6a9a045a2bc7156daa477850c815..e3f571545d97f64b16e09fe9e9a574eb809fb59f 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 0d09304fcbb8573f0f3af296eb60324377348e7c..8938d31c5960663a475f03bb7ac89a4b84886f51 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 4671eeee7fc62d8e7355086ef6ebace746685049..078a0c181569d3f5a5129a7be406ed1310e86420 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 18d57062825e06d15bd831f0a94926fe83233d5d..02c3dfa09e266756c225b0f8d5ff5e79cc7db60c 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 15a31660d2eab6e60fb763efc8df96d3e66cb62a..40637e27613a37b98a2d785f67d6f601434cd587 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 89fcc2cfe63ac2d5e68b040026ac603b1a961b42..ee3cd628fc877f6596b27095c5a95f70750b2c3a 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 c8481dfc7aeecf6418fe5daeb72f3d4ce180e062..bde4d95350c8d62ea897d623f0aeaef5f190ede1 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 ee2b39c687236b345e1a0809159f2f69906803e6..147bf484b7d09ce757450be0416bd239e19daa5b 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 8fef047268e14348bc331ad69174789f3951a0ee..5daf71672698db5fd751755941c1a53ccf743595 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 5b236a7bea5e26a1f06f433f2f044a030d5fa186..8d51c2cc3c810fc2fb95548ea707f1da593d0fdd 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 918420c59220775bf530d7c8455b239c4604853c..5403af86889707aa6d56c1b551694ce7d3681234 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 1b11d9302588911f383dac4e200f40bc9502ea35..f263201e72d601291e2fe77ceb2400b431afb733 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 289cf6ae3f7a5c4cf11ba8c01774f73bd81d03e6..0458f933f663d1bfa8a462547b55813a51de3044 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 af10a04352292132e71358c59c479e4cfa764f96..fffe7be072d9377aa2dc6e106cae5f68731fa8d8 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 9d3920bc53074a61cf69b66fee107ee5b888c737..22fa184d8045275fb3ff73f64d70f06606cd9455 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 8c0623538f1a605a10f8606743810a89e2fe9f27..8097d6c86444d786dba84ad7106da5946bc11b22 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 2a9bfff4594d8530abfeb88ea90505f8234c3ea5..54d6fda1f2607434db690201b1d41428ac3e6862 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 95da85b4b928328c16eabb3ad0a834d2461a70ca..5a729906ace3ad23ebf35d37600914435d5d9888 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 a3984b0790533fe51577e590024962d1e9be4b22..e9e2da471814df3abe8e40db3b14a9a7954b42c1 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 e6d72097a6355836b859b9cebd78da3e268cc31b..cb13ff3e751a94566384b131ad87b7a3840f69a4 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 20a7029bd2a730587057875d4f535c7a717acfde..19451ee57d5f718367614837045bb8c5ad0ec134 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 493fc10cd730392471a59cbd000057ed650a7588..e635888e6c04169a2f6c98720e1b6ac8e93533fd 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 7c9bd57fa783a71632061ac2c1d14da66d6d529a..af4337d02c9a5998127e1ab2edd2e7c9318a3fce 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 5ca71647189768e7651531c023fb831b152aa0f4..a87b72b121edd77fc01c675265bc2ecbae79ea0a 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 271666da0586532c763eb7a42962b9049c6b474b..05df4cb583110f2fc58e6effa56018f42646bdaa 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 eabcd2a5cfad384752c3b4bbd2ea3035f31fbd71..7e984a786e827de981616cef22ed29ef53a78dd7 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 866c6839f2019fc7f843040df86e04302c2166b3..3dfdb482f49dfe91a11eb096dfc32360cf335ad9 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 7f4c2406a74999f59d6c1dfcb62cf8cb47d60c77..e1d65f98dc961c43e0bf31cb1726474ac9dc5276 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 7fb278ea02ef3425bf40d3b9ff3a1b61a762212f..600f60af56c2ad66667f62d11cece977878757dd 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 7e35435e4223307a4ee977d671286c73da365eca..ab4161f20c3c33813e0491252812422e69469086 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 f0a341e08a76edcbe17531cad2913ff5a44a69b4..54a78ae56a9b1925683bd252384a39a82ba22de6 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 52de98ba8feaab9c72846041aa44e063e95320f6..79b1e0adfd94cd424aee7e88f4c41d8498098c43 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 b2d0a22ac4ff9ad1454f6d6b0f004e743bcddc7b..32e32456ebda5eed4c173e485431bfd5122e81ba 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 6fb023a4b777ae16f8f79a3398bf58113e910b00..a63d2262793eece2a752ab399f5a9bc0422c2867 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 35ebf1fdabb0e7433e871d867aacc3b10f238464..815a9ef497a8c6262dc28cefb334e549ade47a91 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 0e7cf1e298a571fc3840612279055f74c42e9aa7..b668b3950753fdd9242f3ec77c8ca11bcec78a7b 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 9dee9973f3f8f177b7f2ceb5d65beee7f540d86a..3329455f92c7428b9f72e967211dc9b14257b9cb 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 747f54d0ac079b78a384f9fd25b3aaa50501f2d9..8fdbfc3bd3494af543f7fc5f11edc120da352fa4 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 49ded49fe014003f25bc888b6c7d980a72c0737d..6a9f6bf10e58286e9a4a224a980cb334868a5852 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 f78104ecb6104e5d03c1d3327dbb36695ab87417..67a40b96f302dee3b76aa79d91860609225cc02b 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 e0afa017460c82b7f001883432272451837c301a..d08cb9cea81f8f48af9f1226d795d953cbcc4a73 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 248b9681c73141f7fe5400f86a03e483307b8e51..048233bbab115e016bb30811dcb882a7f440f0c2 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 219029a5209616ff3ac62cb469ce87761d8b40c1..04e18ebdbfa26a49d6a7114ed83ca7cf2847f584 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 fb059af226a9caf1e5fea6b6ea2fddf03310db7a..3bf32d487ac82711935e8c27a01fd381c2ef1998 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 dd479921f5616e0bb6601d0e8fadeb708f5ee11a..eeb2ec935904ed027599bc30206c081f963ec89a 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 7985acf5e42ab219790f5ce06bfe61816818b4f0..bdebf68a491b1d0517b22f237ae67b682a076632 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 45d91af1275ec9adea9d1ab861b10035d5723351..fcd90167ed9004f9432696a8c781a952ac51af97 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 eb527bbc2be0c13ab303a7820c8e3a50ff8a49b5..16f54b79e198825be54e8354db11025844dee0f4 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 057f22accb63ddb843e83c806f1552eaaf6d6ee9..574c169d03468722c8a81e22cc91d592e035c6f9 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 a8964eadf681368372ed8386af5f59bc15002162..1533790cae2acc5628fa922bef41cfcea9933aa9 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 3346d37d19fb357052f29258643079ae122a0c4b..a8237f42440896cd2ee2a8b3c6a967123e5caab1 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 c28c2534f50b9516c7ece74a171e585b06a7b13f..5d6e4d63f8ead778496e91bf5238d226cd18a249 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 593e516534ca4ca16c14aa5050553a39407649fd..1b068f28f566c6fa2cd528ea37094bef31afe2d0 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 1b5e57b96f4a8e127162a182dbbdcce4edd0f6d1..0d9ddf59077f359280ea725c37d936676d413c30 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 8aef84325f2e0a52ba4397bba417cff2716aca46..1c3aa2bb36cc126f7f96fb8ca51cd4480755e39b 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 ae5abb8e447107f51d3c98bea30db317106a458c..a17a69f1f37da237612f4930702be9e71e5f2182 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 da48929f4fa572356815840b4548a267ee1d718a..ac0f704b18ea74aeb904fe4e0f5152a5d8a5cc6e 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 fa9753cc757e9a737686c980afb5f9e25f20469a..de1046820cb8a5f3e5552021a37ee56b41b8461b 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 2503467bf28ac985c9c441db111e357565840e9e..ae2ebef5599dc4a753ef956185ae3a0fc095fa79 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 5162678671d9a98fa760fe5c2f0a72ca87f22339..27479a82c557ff956e219b926606fd4b998d7d1f 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 7e2ff6609f71dbbbd7911424ac42c40129b787a1..adeb1bfa9885de412047e0e8cfec1b30410f9fa3 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 f583702a6b7eca208bdb96c23b8c51548a02e850..a3ab83b76ceeace58d5cceb6a8ef8bcb119481c2 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 a9ae576610830d6c385288b2f75294178b7f07e8..ee46ffadf1a8abf682dbc9a791f4cb42fbc3088a 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 8c193b670588a464043aa09e96eaf25a34883a3d..3262365907d2891fa1a091a825a6200a3ed96e62 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 fb8f3c1a10148a66bc328e86c1fad0fd183bc746..51f9a6941353b665784cae411892674d355f9596 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 506500b99362d2ef67cef672d3a9aa2165129f0b..e086214ef858b12ff3b2d4b6017fad39ddfba449 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 ef7ee3fd15c61f5047ba6b43613a5bd9cd2e4735..5640b6500704afe9592b1e0ca1d03ff5ddec6f30 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 17dab1576102d4e992ca5a2ba439e948168576e1..a5bf2d20540e78a2657f3644db96870d887f2fc8 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 38a6395e2d966733eef7c0447214715cb55f121b..772e90eedb0a93373187118b57a7b0f10700b0d7 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 dd1dd37af2ac5a7d675da56cce85738954ba8558..66137f58562ef3d43677a6a9670c79fc1bfd4531 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 d725d1957ae1a1aab1e5b2b87c1c204d69b53b94..e66261b821db157cf434a586902e77246ca5bf68 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 af13d99c0f2706b007ef8217353a41405486c126..6d97abfe3c8835ddcca048bad5bcf0ab64cf5568 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 bd71abfc4f3577e67100d4d7414887cfae1618ee..8f39a4525bbe9fb6b8cede81e66d7c21470d4548 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 fbf0b6c45cd1b2e01f13eabc5abb77b3f69b909d..6cc82fce29ced456e8b72470bd5752c0026a5157 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 fb6b91a3a23419f7c073e8d44c1f32cf843eb7a6..b427e87a3ac18cf21620dda0b3dd5c5a12a8e5ea 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 38a6f402fd3b3765ad748a4cccce000af7b7fd99..5c1f810d66793c2b2d70d0dfb2a9c3fd59ab9455 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 989d27cb4ef0a3c9b22d7d91d2e970cafbc2d5d4..546c24c5c29276898adb705e5a5fa866b387073f 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 c847a6e6d28c71607b2588799e71dbd45a34e217..24ddc826c3489f2575b33bd0d4e31b32a243a7ec 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 0459a4e1af284840a8a2cc91bc4d760625814b42..f6109a53316dd63c15ff689ae56cc30d517fbaf5 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 3533c0c3ae4bb277bd22fd9284d97e1cdb98126d..f17091234879b91487976a8665b5468e858c899b 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 894f984f5f4dc6a76d52661973bc320ed17e83d3..bf647db221369cf01a91c8e70f4819ea7d76a6a3 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 29eea521fd9b3d3a00e8a67c8a36c2eb4154d277..c4616be3e95dce32aef04792df6658303c1dd755 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 2bae876f11939b3537b198f15c1f8a285467afe0..61052672cae9424f06880a85778326bac018a6b6 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 9cb798c4057ecc3a479b09c1ef27fd2897b9dc9a..71ea14fa2d70f51f35c19a0c116269355110acaa 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 4915d598fd0d65e7bf8a12b46b2b7ac7a1778538..070c457c447ab440bdc932dfbcc41bfc6bba481d 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 19d85389427ff594f9b7f08b5f6ddec88d3e9697..f98d010436cbe97791f9c15f3c9e70e5d0658f55 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 278488bcea9dfdd49ef059e7d94d4f931f54dc07..d325c19217d3629ae97e3a93e543376e04bb0481 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 a0d76162468a13d6990f00fd5ad91a7fc48f0322..66012b58941edb77d5981d29451d0ad87520a32c 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 26cf9c5578029ea6b7ee7a718c8b512eeabecab7..344a3730552d9fcf95f56789cd825a6c3c2fc7cd 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 cbba316c68e74b20931732e2f3f7ddaaf0aacec2..1cacb2639512bc7218c6d26c69b33ce6fdb8d587 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 156d62cd65b154dc62ff54a31349127126c9c56d..42f3ee56f620d225af8a4ac3dbc644469821b20d 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 dbec0466eff824c123f3de58c93d38b6bbff8235..b8bd0855160d424277c5ee22d860de8e288af5dc 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 8b097899cec1ea4de47e0c2a3a6a1cd5f4fdab5e..f532e4a69d4fec3f89052df29869670690a2b0ef 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 69bf9ec7b8de0bc50e56d85b022de17b9a47598e..ac7f8ee6b5f10890813421d288102f6352404ecd 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 365dc0ed83b766e52ae0a7445c69f31a4eb10b94..93eeaecc7ce7a921b3fd1f258bf8ff94234fda2f 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 00b78f7ed4faeb334cf49fe4e3869329715ba3dd..3506202cd95598c9ff9a1ab0048f2083b77b5e1f 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 a33acfa382507af573927bc453e1d2cb696f353a..896b11dce04eaee7fc56c1f31d959651d1495653 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 51866330dcc6ccf22964ca696214b8866a5da613..a68fea643f089b2dc4cd872afef3c9daf08e7500 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 0e82f2199b83238de81e02e50a52823945cc1bc5..6e168c701ecff07c1348bb5d75a345b9f9a2eb97 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 6dc06c597e42b217ab627d294a56b0023c2155ec..11cfbf398a5090cfd657580fbd50fb3b6ba39d91 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 a8679723aaeeb13c81a6c3c0708b46008cf2613c..35581ee7ead7f1bc782ac2b96b6de6e87c7deeb6 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 22f6ba600aea4f2f7116645599e122a02451e7bf..0d89d95eddeb7df6e3428978238f545cc9088618 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 f07689e0c8366991ce9ae2964583757f8b119faf..ce044889c3e1e5b5521184efaa8ecc3acb3fb5ed 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 2316f388ec68075a776bb1c1f376054a18167be4..f7dd1d22b06d2ebddce5bf019f3e592679e0058a 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 2feb2eb2ed75ce04eb374df7e1f45a5bede01b43..bef28d8deda31bcd07c6e91173c9ae7ef339b3a9 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 93abfadfdd1bc5e811489efe398965c1af512ea2..d2355c6676d6edc57e7016303a82b1a85ab2c943 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 9b2b0d82ace820bf445be8dd11aa04419188d6a7..636a62d056e1bbb28c47e2c4fb0f5cc478beaf70 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 105a710d348df64cd1329856c61dd86bb2240e59..75bc9de9f93a63731d5805a429d65f9fdbd94841 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 22579c48c590537e90e0ae061e5e2f1103527bb3..a80aa446f8a8ab1dfc2d5997ea2a15f602d414e1 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 ca416c02e61cb33f4bde62030ae931c6f4145ec9..caa00224fdfa034a18fb8862877a653e9597fec3 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 6652c7fbf5b9b87d044cd2ff9dc1e3643f416bb6..65c89a37121c64dde368628e3719ffd5af552b94 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 1f864be5f26c5adf9c32018d4df67231b9c218e3..22d1f9cc0f509a6d51478374789acde6d225fcea 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 0b0f5ddb5ef595e4466b083cf37827c9fcdc7082..3b9e481582985cb085ed0883b337adb48ae16ffc 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 90f535aa294c9b91fb08a98147448cc9bedc565b..e6e5da4efb4e034d81cabbfe2eac5478dfe46f08 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 398443d83ad73cd64f22746cb4242cbe40531419..1b699b5ca41c8ec0e7f80809e46c93b4ceb189a1 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 fdab88d5c940a5344cc2db3e794ebc44fe48ea19..4a4c9d6c64c0e04a43a330ebc66198d2135f7adf 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 e7083858cd8cf0d016b3849ba38bf79b08c5d600..67df606aacdcf83140ad012828ce1c6789df7e64 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 bfd401f3790866680be665c260f38cf6fe79a661..22d043cf49ee3ce343ffbf45be1f91803e01f28c 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 e58372d750f913966f8df3113f0a853e728e9d20..1a9c2df2b8274eed04755ed585c69742880df74d 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 4cefecd0ec9385c04e24cc428073ce753f7dd1e1..15ef3776ec22cc278765426ebf7e59b81b4a25ae 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 a7ea13714844167bb95b7aa4a336bdab1b82fc5e..e3997cd9a5c6e945dd543c3ec25614fbd5071d94 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 bc7edcc595b84597899e4f6881cc669a807a83d2..2a29ac0faf79ce2df69dbd49dbdbfa13c4ca8de7 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 ca8c4fb0b65bd85fc71407caf08cc8808a8669f1..a3fbe25c6e380fde99b16d90082532bed8d67d01 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 c088643b8cf0dce5971791a9fcc4cbc835ac4234..eedb7d845bbcc7465159cbf6f43ddf6135e28c45 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 06f3604bef54f7c34fb1e88f2d6b38eab3c4ac9f..85a8f0de73a75b3d612ed9f6296aa50dedaed872 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 f28d949d0201f604b13d13d1a0e90ffaa65bf912..8d416bc60b3c8e058aecdb6feea7ba257bce3130 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 78e26d4ca04b491bf2a4a11ba2ae416443f4c44a..fd8f02dbd4ee65d95b1cf3e65491c946987e16db 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 6b1aa962d411cf733962d4dccafd9844b7571b55..649e67b6a149adce135a89ee3acb02da02c47ff8 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 deb3b1174001734d148a37e86c1c0c9067eebcb5..1d6fe54207619528cb168cb4c0b4f0a6ca080850 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 edb3b11be5c6fdb2a58bcca3dad98129000c2e10..1e6c27bfe730d2df614773ab16dda86335b9e056 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 4cafaab3340f22fc2c668a4a4aa8ad96d6481a74..8bfbaca6fcb5c96bd68677f91963e722c390754f 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 b1432c28067c6fddf6a9db4c6ee073bd3da8bba3..a5dcee3a721e9d7f7634bf3b5c18869e353bdfa8 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 cb6c12dde167f733e0bb0279287014c42c6350a4..95a13620b934f06a5e05078906eeba5c158522b8 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 2e505089de3f78fff08e74654fe0d70acba10f91..f00003d51cbb1b026b010e40ddbb0153fa240c70 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 f4ba1b5621645cadde5f06de40faabdf4d87c8bf..f00da6d3d90873542cced9adc878ed996fff4e4c 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 73e60314e52f35b63a4bda2c22cfe45ef76e0c0f..dcda9c2c959dbb65255e76b0c754896f332b4b27 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 b7848970908fd472188b8e79e5c92bcdf84fc16d..478098acd9cc3791f400daf455b416bef25697ac 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 476d2e1004262a2c89589598ba6057c1d8c74312..a30025548c92e7c75ee352894a2c93896df1f199 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 87d717325bb53e3706eb7c2b4089d68de8cb764b..027d4ce56502287abf788e869d161c528b442cc2 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 e0d460bc0092384015026ecc3b813af17239ab64..0e7c453cec11da0f7744af10458822a81e4d2e9f 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 e4b88a3cc44ec0185e04a6beb0bde09231034286..f6351f875a021e13fcd2d6a5bcca275677eacef5 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 1eb64403c2226b1307a27c09968ff2be157db88d..93394ef47a518dd81887af3f589575c27eac44ee 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 794833cc15f5b92722a55dd2355db22051387e5b..c18cd9892ab15fb49aa120478b2ac8376cee1518 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 4a900174cc0ae50703bb1ad6ba1abea753c6e5b4..d173d8fa9cff3c99f5385a7876a8595fe03c2b80 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 69ba01f0d90ea05ed2f430dfa4610b3c8551479b..ecd7bd0c229a964b276ef274032b90e2bb6e9e6a 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 514a143a6eef508d5f4ad625439d13e7ccd400a7..ca7fd753424013fdb99b073358ec25204b4ed33c 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 940fd6f318c90277e085caa29444a301b5d698ed..ccbe6c0c842ce3e1a43f939bdf26833ad4d76b4b 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 ca9a739c50235b2b3719c95b3fa293a37b266e3d..e7ecdc5910016146dbc9bae6ff3d6fc68b9ef69c 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 0a7d21dcbdabf1933a07d52a726b970ebfa97f22..a77a8e4eb5905be90e6abfcec7bd7ab51a0c786d 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 72bb473f662bb1857bdbe333dad1d42494138911..eb41fbdfdf77b57e3831c7e459c1a16f0fb978e9 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 87df12b36c7cfd91bd57913b6b657948d46a9dc1..be393ac19925a1180b60dd19ec5baec6c43b2026 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 639850df6a87c517dc09d83a930fc2d5b49ae0fd..df3d1b11f6bbd1351479353f9765bfab88d1a745 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 366fe61a952039832c9ec91432be9a0c95815268..377835940d98ba2f52b227550626f4dccbf55314 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 c049378573cfdb97876dd0a5f6cded8a6be86ac6..eb21615f95203026505a36688367a7075a77192b 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 dfb41951b1059f22fb25dcc750a5d90d04fc22d4..7316d79e2af5321308119c8e11163c4ef323f685 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 3c337dd6481cef274ba9a92ba8e8f9e5e81151f9..3ac1965cca371a39aba76c6824fff009f5b90cd4 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 b20a1bafc1e8e706b35ba21d976cd00cba5c59cf..0862780e3de7f64cd5ae9d99c408cb90473b6171 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 91340749b25b9687e358d8dbafab6d9e1f29c03f..ff1ae6fd9ce90e1b222164f17626ca02cdf0a491 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 24850609c95c202126f2269cce6ad584d7689ee2..cb2752767a51a0dea053c66d804ef549fdc8c16d 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 acf779c6d9fd2ab5b274b72f58b130b856bf993e..5cdc4d56324029d7bf7bebe7b91c882f1399f914 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 65d5803eef17550f09f2242eb6cd2260a773673a..ccb3bdc1ac5e781bc8520a23bbd9755d7f76ee5f 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 2039dd9899a4abaf56eb02d4d12bc7ace735f395..4d6cf2e1f1dfd4d4a013b15ce7e42495ea555b0b 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 f22393b6c772cc49e9f82bbb565736132b5ee762..21005ddc53b651749a68308cf137aee9ac2365f4 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 ed8bac1c9c6da99ef2a3082d8a871605b5bebaa6..345b4544fe020fc65314dffdfdb1c968bd830c1c 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 a8ba2b4ed18c54664415831531be773d5a01e388..7e36fee517aa14406578d9db2341dae4fff13811 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 b3eb86edb746764a68447d0a988cd91f35388f4e..4f719efda12fb9ab3cc4de75fde41a3cd7ea168e 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 025e8f81630e9cebf969bd378b876c44d8379006..024d508ca878fafcd55bcd527f2a5d0a74f7b8ca 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 680f8a184593d263cbc5caaf3fb26a63b8448e38..fd1c398ffde30e110d073e11d2f7bd952f1215d4 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 288d0877736256cf33e4bb8038e77179fbfef5ed..a5fa72b727809119b2c754307f7d6aaa3ed6495f 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 f547d9e40852a81bb44df2f339022f9f05ed354a..79e1a047eb7d0f6d10447ab298bca8e8a424df52 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 8b8075ca400b347b6d8e01c629a4eea843ae838e..1f8c45d8cc8aa4abfa9582114665ff4c0f1fa619 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;