Skip to content

Commit

Permalink
tests/tcg: target/mips: Include isa/ase and group name in test output
Browse files Browse the repository at this point in the history 
For better appearance and usefullnes, include ISA/ASE name and
instruction group name in the output of tests. For example, all
this data will be displayed for FMAX_A.W test:

| MSA       | Float Max Min       | FMAX_A.W    |
| PASS:  80 | FAIL:   0 | elapsed time: 0.16 ms |

(the data will be displayed in one row; they are presented here in two
rows not to exceed the width of the commit message)

Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>
Message-Id: <1561031359-6727-2-git-send-email-aleksandar.markovic@rt-rk.com>
  • Loading branch information
@AMarkovic
AMarkovic committed Jun 21, 2019
1 parent 1f8929d commit 8e6fe6b
Show file tree
Hide file tree
Showing 260 changed files with 1,492 additions and 736 deletions.
17 changes: 10 additions & 7 deletions tests/tcg/mips/include/test_utils_128.h
View file
Expand Up @@ -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;
Expand All @@ -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])) {
Expand All @@ -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) {
Expand Down
9 changes: 6 additions & 3 deletions tests/tcg/mips/include/test_utils_64.h
View file
Expand Up @@ -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,
Expand All @@ -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++;
Expand All @@ -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) {
Expand Down
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_b.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_d.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_h.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_nloc_w.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_b.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_d.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_h.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_nlzc_w.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_b.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_d.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_h.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-count/test_msa_pcnt_w.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_b.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
9 changes: 6 additions & 3 deletions tests/tcg/mips/user/ase/msa/bit-set/test_msa_bclr_d.c
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

0 comments on commit 8e6fe6b

Please sign in to comment.