From 25c15bb47118d587e49ed398bc2957b28f3be610 Mon Sep 17 00:00:00 2001 From: Edward Smyth Date: Thu, 25 Apr 2024 08:34:39 -0400 Subject: [PATCH] GTestSuite: test name consistency changes 2 Improve consistency in test names across different APIs. In this commit, standardize m, n, k and b in test names. AMD-Internal: [CPUPL-4500] Change-Id: I53e7dd83cbf426ab1ebe8aa4af1da01594f4af23 --- .../extension/imatcopy/cimatcopy_evt.cpp | 4 ++-- .../extension/imatcopy/cimatcopy_generic.cpp | 4 ++-- .../extension/imatcopy/dimatcopy_evt.cpp | 4 ++-- .../extension/imatcopy/dimatcopy_generic.cpp | 4 ++-- .../extension/imatcopy/simatcopy_evt.cpp | 4 ++-- .../extension/imatcopy/simatcopy_generic.cpp | 4 ++-- .../extension/imatcopy/zimatcopy_evt.cpp | 4 ++-- .../extension/imatcopy/zimatcopy_generic.cpp | 4 ++-- .../extension/omatcopy/comatcopy_evt.cpp | 4 ++-- .../extension/omatcopy/comatcopy_generic.cpp | 4 ++-- .../extension/omatcopy/domatcopy_evt.cpp | 4 ++-- .../extension/omatcopy/domatcopy_generic.cpp | 4 ++-- .../extension/omatcopy/somatcopy_evt.cpp | 4 ++-- .../extension/omatcopy/somatcopy_generic.cpp | 4 ++-- .../extension/omatcopy/zomatcopy_evt.cpp | 4 ++-- .../extension/omatcopy/zomatcopy_generic.cpp | 4 ++-- .../extension/omatcopy2/comatcopy2_evt.cpp | 4 ++-- .../omatcopy2/comatcopy2_generic.cpp | 4 ++-- .../extension/omatcopy2/domatcopy2_evt.cpp | 4 ++-- .../omatcopy2/domatcopy2_generic.cpp | 4 ++-- .../omatcopy2/somatcopy2_generic.cpp | 4 ++-- .../extension/omatcopy2/somatcopy2_evt.cpp | 4 ++-- .../omatcopy2/somatcopy2_generic.cpp | 4 ++-- .../extension/omatcopy2/zomatcopy2_evt.cpp | 4 ++-- .../omatcopy2/zomatcopy2_generic.cpp | 4 ++-- .../testsuite/level1/addv/caddv_generic.cpp | 2 +- .../testsuite/level1/addv/daddv_generic.cpp | 2 +- .../testsuite/level1/addv/saddv_generic.cpp | 2 +- .../testsuite/level1/addv/zaddv_generic.cpp | 2 +- .../testsuite/level1/amaxv/camaxv_generic.cpp | 2 +- .../level1/amaxv/damaxv_evt_testing.cpp | 2 +- .../testsuite/level1/amaxv/damaxv_generic.cpp | 2 +- .../level1/amaxv/samaxv_evt_testing.cpp | 2 +- .../testsuite/level1/amaxv/samaxv_generic.cpp | 2 +- .../testsuite/level1/amaxv/zamaxv_generic.cpp | 2 +- .../level1/axpbyv/caxpbyv_generic.cpp | 2 +- .../level1/axpbyv/daxpbyv_evt_testing.cpp | 4 ++-- .../level1/axpbyv/daxpbyv_generic.cpp | 2 +- .../level1/axpbyv/saxpbyv_generic.cpp | 2 +- .../level1/axpbyv/zaxpbyv_evt_testing.cpp | 4 ++-- .../level1/axpbyv/zaxpbyv_generic.cpp | 2 +- .../testsuite/level1/axpyf/daxpyf_generic.cpp | 4 ++-- .../testsuite/level1/axpyv/caxpyv_generic.cpp | 2 +- .../level1/axpyv/daxpyv_evt_testing.cpp | 4 ++-- .../testsuite/level1/axpyv/daxpyv_generic.cpp | 2 +- .../level1/axpyv/saxpyv_evt_testing.cpp | 4 ++-- .../testsuite/level1/axpyv/saxpyv_generic.cpp | 2 +- .../level1/axpyv/zaxpyv_evt_testing.cpp | 4 ++-- .../testsuite/level1/axpyv/zaxpyv_generic.cpp | 2 +- .../testsuite/level1/copyv/ccopyv_generic.cpp | 2 +- .../testsuite/level1/copyv/dcopyv_generic.cpp | 2 +- .../testsuite/level1/copyv/scopyv_generic.cpp | 2 +- .../testsuite/level1/copyv/zcopyv_generic.cpp | 2 +- .../testsuite/level1/dotv/cdotv_generic.cpp | 2 +- .../level1/dotv/ddotv_evt_testing.cpp | 2 +- .../testsuite/level1/dotv/ddotv_generic.cpp | 2 +- .../testsuite/level1/dotv/sdotv_generic.cpp | 2 +- .../testsuite/level1/dotv/zdotv_generic.cpp | 2 +- .../testsuite/level1/dotxf/ddotxf_generic.cpp | 4 ++-- .../testsuite/level1/dotxv/cdotxv_generic.cpp | 2 +- .../testsuite/level1/dotxv/ddotxv_generic.cpp | 2 +- .../testsuite/level1/dotxv/sdotxv_generic.cpp | 2 +- .../testsuite/level1/dotxv/zdotxv_generic.cpp | 2 +- .../level1/scal2v/cscal2v_generic.cpp | 2 +- .../level1/scal2v/dscal2v_generic.cpp | 2 +- .../level1/scal2v/sscal2v_generic.cpp | 2 +- .../level1/scal2v/zscal2v_generic.cpp | 2 +- .../testsuite/level1/scalv/cscalv_generic.cpp | 2 +- .../level1/scalv/dscalv_evt_testing.cpp | 2 +- .../testsuite/level1/scalv/dscalv_generic.cpp | 2 +- .../testsuite/level1/scalv/sscalv_generic.cpp | 2 +- .../level1/scalv/zdscalv_evt_testing.cpp | 2 +- .../level1/scalv/zdscalv_generic.cpp | 2 +- .../level1/scalv/zscalv_evt_testing.cpp | 2 +- .../testsuite/level1/scalv/zscalv_generic.cpp | 2 +- .../testsuite/level1/setv/csetv_generic.cpp | 2 +- .../testsuite/level1/setv/dsetv_generic.cpp | 2 +- .../testsuite/level1/setv/ssetv_generic.cpp | 2 +- .../testsuite/level1/setv/zsetv_generic.cpp | 2 +- .../level1/subv/csubv_evt_testing.cpp | 2 +- .../level1/subv/dsubv_evt_testing.cpp | 2 +- .../level1/subv/ssubv_evt_testing.cpp | 2 +- .../level1/subv/zsubv_evt_testing.cpp | 2 +- .../testsuite/level1/xpbyv/cxpbyv_generic.cpp | 2 +- .../testsuite/level1/xpbyv/dxpbyv_generic.cpp | 2 +- .../testsuite/level1/xpbyv/sxpbyv_generic.cpp | 2 +- .../testsuite/level1/xpbyv/zxpbyv_generic.cpp | 2 +- .../level2/gemv/cgemv_evt_testing.cpp | 4 ++-- .../testsuite/level2/gemv/cgemv_generic.cpp | 4 ++-- .../level2/gemv/dgemv_evt_testing.cpp | 4 ++-- .../testsuite/level2/gemv/dgemv_generic.cpp | 4 ++-- .../level2/gemv/sgemv_evt_testing.cpp | 4 ++-- .../testsuite/level2/gemv/sgemv_generic.cpp | 4 ++-- .../level2/gemv/zgemv_evt_testing.cpp | 4 ++-- .../testsuite/level2/gemv/zgemv_generic.cpp | 4 ++-- gtestsuite/testsuite/level2/ger/cger_evt.cpp | 4 ++-- .../testsuite/level2/ger/cger_generic.cpp | 4 ++-- gtestsuite/testsuite/level2/ger/dger_evt.cpp | 4 ++-- .../testsuite/level2/ger/dger_generic.cpp | 4 ++-- gtestsuite/testsuite/level2/ger/sger_evt.cpp | 4 ++-- .../testsuite/level2/ger/sger_generic.cpp | 4 ++-- gtestsuite/testsuite/level2/ger/zger_evt.cpp | 4 ++-- .../testsuite/level2/ger/zger_generic.cpp | 4 ++-- .../testsuite/level2/hemv/chemv_generic.cpp | 2 +- .../testsuite/level2/hemv/zhemv_generic.cpp | 2 +- .../testsuite/level2/her/cher_generic.cpp | 2 +- .../testsuite/level2/her/zher_generic.cpp | 2 +- .../testsuite/level2/her2/cher2_generic.cpp | 2 +- .../testsuite/level2/her2/zher2_generic.cpp | 2 +- .../testsuite/level2/symv/dsymv_generic.cpp | 2 +- .../testsuite/level2/symv/ssymv_generic.cpp | 2 +- .../testsuite/level2/syr/dsyr_generic.cpp | 2 +- .../testsuite/level2/syr/ssyr_generic.cpp | 2 +- .../testsuite/level2/syr2/dsyr2_generic.cpp | 2 +- .../testsuite/level2/syr2/ssyr2_generic.cpp | 2 +- .../testsuite/level2/trmv/ctrmv_generic.cpp | 2 +- .../testsuite/level2/trmv/dtrmv_generic.cpp | 2 +- .../testsuite/level2/trmv/strmv_generic.cpp | 2 +- .../testsuite/level2/trmv/ztrmv_generic.cpp | 2 +- .../testsuite/level2/trsv/ctrsv_generic.cpp | 2 +- .../level2/trsv/dtrsv_evt_testing.cpp | 2 +- .../testsuite/level2/trsv/dtrsv_generic.cpp | 2 +- .../testsuite/level2/trsv/strsv_generic.cpp | 2 +- .../level2/trsv/ztrsv_evt_testing.cpp | 2 +- .../testsuite/level2/trsv/ztrsv_generic.cpp | 2 +- .../level3/gemm/cgemm_evt_testing.cpp | 6 +++--- .../testsuite/level3/gemm/cgemm_generic.cpp | 6 +++--- .../level3/gemm/dgemm_evt_testing.cpp | 6 +++--- .../testsuite/level3/gemm/dgemm_generic.cpp | 6 +++--- .../testsuite/level3/gemm/dgemm_ovr_undr.cpp | 6 +++--- .../level3/gemm/sgemm_evt_testing.cpp | 6 +++--- .../testsuite/level3/gemm/sgemm_generic.cpp | 6 +++--- .../level3/gemm/zgemm_evt_testing.cpp | 6 +++--- .../testsuite/level3/gemm/zgemm_generic.cpp | 6 +++--- .../gemm_compute/dgemm_compute_generic.cpp | 6 +++--- .../gemm_compute/sgemm_compute_generic.cpp | 6 +++--- .../testsuite/level3/gemmt/cgemmt_generic.cpp | 4 ++-- .../level3/gemmt/dgemmt_evt_testing.cpp | 4 ++-- .../testsuite/level3/gemmt/dgemmt_generic.cpp | 4 ++-- .../testsuite/level3/gemmt/sgemmt_generic.cpp | 4 ++-- .../testsuite/level3/gemmt/zgemmt_generic.cpp | 4 ++-- .../testsuite/level3/hemm/chemm_generic.cpp | 4 ++-- .../testsuite/level3/hemm/zhemm_generic.cpp | 4 ++-- .../testsuite/level3/her2k/cher2k_generic.cpp | 4 ++-- .../testsuite/level3/her2k/zher2k_generic.cpp | 4 ++-- .../testsuite/level3/herk/cherk_generic.cpp | 4 ++-- .../testsuite/level3/herk/zherk_generic.cpp | 4 ++-- .../testsuite/level3/symm/csymm_generic.cpp | 4 ++-- .../testsuite/level3/symm/dsymm_generic.cpp | 4 ++-- .../testsuite/level3/symm/ssymm_generic.cpp | 4 ++-- .../testsuite/level3/symm/zsymm_generic.cpp | 4 ++-- .../testsuite/level3/syr2k/csyr2k_generic.cpp | 4 ++-- .../testsuite/level3/syr2k/dsyr2k_generic.cpp | 4 ++-- .../testsuite/level3/syr2k/ssyr2k_generic.cpp | 4 ++-- .../testsuite/level3/syr2k/zsyr2k_generic.cpp | 4 ++-- .../testsuite/level3/syrk/csyrk_generic.cpp | 4 ++-- .../testsuite/level3/syrk/dsyrk_generic.cpp | 4 ++-- .../testsuite/level3/syrk/ssyrk_generic.cpp | 4 ++-- .../testsuite/level3/syrk/zsyrk_generic.cpp | 4 ++-- .../testsuite/level3/trmm/ctrmm_generic.cpp | 4 ++-- .../testsuite/level3/trmm/dtrmm_generic.cpp | 4 ++-- .../testsuite/level3/trmm/strmm_generic.cpp | 4 ++-- .../testsuite/level3/trmm/ztrmm_generic.cpp | 4 ++-- .../testsuite/level3/trmm3/ctrmm3_generic.cpp | 4 ++-- .../testsuite/level3/trmm3/dtrmm3_generic.cpp | 4 ++-- .../testsuite/level3/trmm3/strmm3_generic.cpp | 4 ++-- .../testsuite/level3/trmm3/ztrmm3_generic.cpp | 4 ++-- .../level3/trsm/ctrsm_evt_testing.cpp | 4 ++-- .../testsuite/level3/trsm/ctrsm_generic.cpp | 4 ++-- .../level3/trsm/dtrsm_evt_testing.cpp | 4 ++-- .../testsuite/level3/trsm/dtrsm_generic.cpp | 4 ++-- .../level3/trsm/strsm_evt_testing.cpp | 4 ++-- .../testsuite/level3/trsm/strsm_generic.cpp | 4 ++-- .../level3/trsm/ztrsm_evt_testing.cpp | 4 ++-- .../testsuite/level3/trsm/ztrsm_generic.cpp | 4 ++-- gtestsuite/testsuite/ukr/amaxv/damaxv_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/amaxv/samaxv_ukr.cpp | 2 +- .../testsuite/ukr/axpbyv/daxpbyv_ukr.cpp | 2 +- .../testsuite/ukr/axpbyv/saxpbyv_ukr.cpp | 2 +- .../testsuite/ukr/axpbyv/zaxpbyv_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/axpyv/daxpyv_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/axpyv/saxpyv_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/axpyv/zaxpyv_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/copyv/dcopyv_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/dotv/ddotv_ukr.cpp | 2 +- .../testsuite/ukr/gemm/cgemm_ukernel.cpp | 8 ++++---- .../testsuite/ukr/gemm/dgemm_ukernel.cpp | 20 +++++++++---------- .../testsuite/ukr/gemm/sgemm_ukernel.cpp | 14 ++++++------- .../testsuite/ukr/gemm/zgemm_ukernel.cpp | 8 ++++---- gtestsuite/testsuite/ukr/nrm2/dnrm2_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/nrm2/dznrm2_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/nrm2/scnrm2_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/nrm2/snrm2_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/scalv/dscalv_ukr.cpp | 2 +- .../testsuite/ukr/scalv/zdscalv_ukr.cpp | 2 +- gtestsuite/testsuite/ukr/scalv/zscalv_ukr.cpp | 2 +- .../util/asumv/dasumv_evt_testing.cpp | 2 +- .../testsuite/util/asumv/dasumv_generic.cpp | 2 +- .../testsuite/util/asumv/dzasumv_generic.cpp | 2 +- .../testsuite/util/asumv/sasumv_generic.cpp | 2 +- .../testsuite/util/asumv/scasumv_generic.cpp | 2 +- .../util/nrm2/dnrm2_extreme_values.cpp | 2 +- .../testsuite/util/nrm2/dnrm2_generic.cpp | 2 +- .../util/nrm2/dznrm2_extreme_values.cpp | 2 +- .../testsuite/util/nrm2/dznrm2_generic.cpp | 2 +- .../util/nrm2/scnrm2_extreme_values.cpp | 2 +- .../testsuite/util/nrm2/scnrm2_generic.cpp | 2 +- .../util/nrm2/snrm2_extreme_values.cpp | 2 +- .../testsuite/util/nrm2/snrm2_generic.cpp | 2 +- 209 files changed, 339 insertions(+), 339 deletions(-) diff --git a/gtestsuite/testsuite/extension/imatcopy/cimatcopy_evt.cpp b/gtestsuite/testsuite/extension/imatcopy/cimatcopy_evt.cpp index 0389ca5c6..46d2e9955 100644 --- a/gtestsuite/testsuite/extension/imatcopy/cimatcopy_evt.cpp +++ b/gtestsuite/testsuite/extension/imatcopy/cimatcopy_evt.cpp @@ -114,8 +114,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/imatcopy/cimatcopy_generic.cpp b/gtestsuite/testsuite/extension/imatcopy/cimatcopy_generic.cpp index dc4f4ff2a..8e6a617d8 100644 --- a/gtestsuite/testsuite/extension/imatcopy/cimatcopy_generic.cpp +++ b/gtestsuite/testsuite/extension/imatcopy/cimatcopy_generic.cpp @@ -110,8 +110,8 @@ public: #endif str_name += "_" + std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); char mat_trans = ( ( trans == 'n' ) || ( trans == 'r' ) )? 'n' : 't'; gtint_t lda_in = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/imatcopy/dimatcopy_evt.cpp b/gtestsuite/testsuite/extension/imatcopy/dimatcopy_evt.cpp index 0be173bec..a5b30f68b 100644 --- a/gtestsuite/testsuite/extension/imatcopy/dimatcopy_evt.cpp +++ b/gtestsuite/testsuite/extension/imatcopy/dimatcopy_evt.cpp @@ -114,8 +114,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/imatcopy/dimatcopy_generic.cpp b/gtestsuite/testsuite/extension/imatcopy/dimatcopy_generic.cpp index 585081722..a781a92b5 100644 --- a/gtestsuite/testsuite/extension/imatcopy/dimatcopy_generic.cpp +++ b/gtestsuite/testsuite/extension/imatcopy/dimatcopy_generic.cpp @@ -110,8 +110,8 @@ public: #endif str_name += "_" + std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); char mat_trans = ( ( trans == 'n' ) || ( trans == 'r' ) )? 'n' : 't'; gtint_t lda_in = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/imatcopy/simatcopy_evt.cpp b/gtestsuite/testsuite/extension/imatcopy/simatcopy_evt.cpp index 1b750d8b7..1d6f02443 100644 --- a/gtestsuite/testsuite/extension/imatcopy/simatcopy_evt.cpp +++ b/gtestsuite/testsuite/extension/imatcopy/simatcopy_evt.cpp @@ -114,8 +114,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/imatcopy/simatcopy_generic.cpp b/gtestsuite/testsuite/extension/imatcopy/simatcopy_generic.cpp index 78bfab15a..d54281875 100644 --- a/gtestsuite/testsuite/extension/imatcopy/simatcopy_generic.cpp +++ b/gtestsuite/testsuite/extension/imatcopy/simatcopy_generic.cpp @@ -110,8 +110,8 @@ public: #endif str_name += "_" + std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); char mat_trans = ( ( trans == 'n' ) || ( trans == 'r' ) )? 'n' : 't'; gtint_t lda_in = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/imatcopy/zimatcopy_evt.cpp b/gtestsuite/testsuite/extension/imatcopy/zimatcopy_evt.cpp index a661e166b..f5c416b2d 100644 --- a/gtestsuite/testsuite/extension/imatcopy/zimatcopy_evt.cpp +++ b/gtestsuite/testsuite/extension/imatcopy/zimatcopy_evt.cpp @@ -114,8 +114,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/imatcopy/zimatcopy_generic.cpp b/gtestsuite/testsuite/extension/imatcopy/zimatcopy_generic.cpp index 0b9cfc7e4..8ff3a86db 100644 --- a/gtestsuite/testsuite/extension/imatcopy/zimatcopy_generic.cpp +++ b/gtestsuite/testsuite/extension/imatcopy/zimatcopy_generic.cpp @@ -110,8 +110,8 @@ public: #endif str_name += "_" + std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); char mat_trans = ( ( trans == 'n' ) || ( trans == 'r' ) )? 'n' : 't'; gtint_t lda_in = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy/comatcopy_evt.cpp b/gtestsuite/testsuite/extension/omatcopy/comatcopy_evt.cpp index ea034cfe0..b2b86525f 100644 --- a/gtestsuite/testsuite/extension/omatcopy/comatcopy_evt.cpp +++ b/gtestsuite/testsuite/extension/omatcopy/comatcopy_evt.cpp @@ -114,8 +114,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy/comatcopy_generic.cpp b/gtestsuite/testsuite/extension/omatcopy/comatcopy_generic.cpp index 02c8d9ff3..5c9bcffe5 100644 --- a/gtestsuite/testsuite/extension/omatcopy/comatcopy_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy/comatcopy_generic.cpp @@ -110,8 +110,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy/domatcopy_evt.cpp b/gtestsuite/testsuite/extension/omatcopy/domatcopy_evt.cpp index 64124126b..66d5a0145 100644 --- a/gtestsuite/testsuite/extension/omatcopy/domatcopy_evt.cpp +++ b/gtestsuite/testsuite/extension/omatcopy/domatcopy_evt.cpp @@ -114,8 +114,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy/domatcopy_generic.cpp b/gtestsuite/testsuite/extension/omatcopy/domatcopy_generic.cpp index e8b9c497b..1471e3c5d 100644 --- a/gtestsuite/testsuite/extension/omatcopy/domatcopy_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy/domatcopy_generic.cpp @@ -110,8 +110,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy/somatcopy_evt.cpp b/gtestsuite/testsuite/extension/omatcopy/somatcopy_evt.cpp index 69b727704..ec7ef49ab 100644 --- a/gtestsuite/testsuite/extension/omatcopy/somatcopy_evt.cpp +++ b/gtestsuite/testsuite/extension/omatcopy/somatcopy_evt.cpp @@ -114,8 +114,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy/somatcopy_generic.cpp b/gtestsuite/testsuite/extension/omatcopy/somatcopy_generic.cpp index a86810760..3cde09935 100644 --- a/gtestsuite/testsuite/extension/omatcopy/somatcopy_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy/somatcopy_generic.cpp @@ -110,8 +110,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy/zomatcopy_evt.cpp b/gtestsuite/testsuite/extension/omatcopy/zomatcopy_evt.cpp index 12f7dcaec..f862bd100 100644 --- a/gtestsuite/testsuite/extension/omatcopy/zomatcopy_evt.cpp +++ b/gtestsuite/testsuite/extension/omatcopy/zomatcopy_evt.cpp @@ -114,8 +114,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy/zomatcopy_generic.cpp b/gtestsuite/testsuite/extension/omatcopy/zomatcopy_generic.cpp index 6c02f6290..695661445 100644 --- a/gtestsuite/testsuite/extension/omatcopy/zomatcopy_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy/zomatcopy_generic.cpp @@ -110,8 +110,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/comatcopy2_evt.cpp b/gtestsuite/testsuite/extension/omatcopy2/comatcopy2_evt.cpp index 187392410..b9bf3b1d4 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/comatcopy2_evt.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/comatcopy2_evt.cpp @@ -122,8 +122,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/comatcopy2_generic.cpp b/gtestsuite/testsuite/extension/omatcopy2/comatcopy2_generic.cpp index d327182ba..f06ee3eae 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/comatcopy2_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/comatcopy2_generic.cpp @@ -118,8 +118,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/domatcopy2_evt.cpp b/gtestsuite/testsuite/extension/omatcopy2/domatcopy2_evt.cpp index 0da615020..a463b298c 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/domatcopy2_evt.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/domatcopy2_evt.cpp @@ -122,8 +122,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/domatcopy2_generic.cpp b/gtestsuite/testsuite/extension/omatcopy2/domatcopy2_generic.cpp index 47064eb72..88b1014fa 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/domatcopy2_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/domatcopy2_generic.cpp @@ -118,8 +118,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/omatcopy2/somatcopy2_generic.cpp b/gtestsuite/testsuite/extension/omatcopy2/omatcopy2/somatcopy2_generic.cpp index 01bd26303..875ba9e6e 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/omatcopy2/somatcopy2_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/omatcopy2/somatcopy2_generic.cpp @@ -118,8 +118,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/somatcopy2_evt.cpp b/gtestsuite/testsuite/extension/omatcopy2/somatcopy2_evt.cpp index 1c53b12ff..1af0ed4da 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/somatcopy2_evt.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/somatcopy2_evt.cpp @@ -122,8 +122,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/somatcopy2_generic.cpp b/gtestsuite/testsuite/extension/omatcopy2/somatcopy2_generic.cpp index cb65df07c..59c67e1fe 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/somatcopy2_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/somatcopy2_generic.cpp @@ -118,8 +118,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/zomatcopy2_evt.cpp b/gtestsuite/testsuite/extension/omatcopy2/zomatcopy2_evt.cpp index caea69256..b0af8112b 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/zomatcopy2_evt.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/zomatcopy2_evt.cpp @@ -122,8 +122,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_A_exval" + testinghelpers::get_value_string(exval); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); diff --git a/gtestsuite/testsuite/extension/omatcopy2/zomatcopy2_generic.cpp b/gtestsuite/testsuite/extension/omatcopy2/zomatcopy2_generic.cpp index 4907fa9fb..695081456 100644 --- a/gtestsuite/testsuite/extension/omatcopy2/zomatcopy2_generic.cpp +++ b/gtestsuite/testsuite/extension/omatcopy2/zomatcopy2_generic.cpp @@ -118,8 +118,8 @@ public: #endif str_name += std::string(&storage, 1); str_name += "_" + std::string(&trans, 1); - str_name += "_" + std::to_string(m); - str_name += "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t lda = testinghelpers::get_leading_dimension( storage, 'n', m, n, lda_inc ); gtint_t ldb = testinghelpers::get_leading_dimension( storage, trans, m, n, ldb_inc ); diff --git a/gtestsuite/testsuite/level1/addv/caddv_generic.cpp b/gtestsuite/testsuite/level1/addv/caddv_generic.cpp index ceec76b1e..cafbd965c 100644 --- a/gtestsuite/testsuite/level1/addv/caddv_generic.cpp +++ b/gtestsuite/testsuite/level1/addv/caddv_generic.cpp @@ -83,7 +83,7 @@ public: gtint_t incx = std::get<2>(str.param); gtint_t incy = std::get<3>(str.param); std::string str_name = "bli_caddv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/addv/daddv_generic.cpp b/gtestsuite/testsuite/level1/addv/daddv_generic.cpp index 39173cc95..ac698a506 100644 --- a/gtestsuite/testsuite/level1/addv/daddv_generic.cpp +++ b/gtestsuite/testsuite/level1/addv/daddv_generic.cpp @@ -82,7 +82,7 @@ public: gtint_t incx = std::get<2>(str.param); gtint_t incy = std::get<3>(str.param); std::string str_name = "bli_daddv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/addv/saddv_generic.cpp b/gtestsuite/testsuite/level1/addv/saddv_generic.cpp index 3c9420df0..ecb52c9fe 100644 --- a/gtestsuite/testsuite/level1/addv/saddv_generic.cpp +++ b/gtestsuite/testsuite/level1/addv/saddv_generic.cpp @@ -82,7 +82,7 @@ public: gtint_t incx = std::get<2>(str.param); gtint_t incy = std::get<3>(str.param); std::string str_name = "bli_saddv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/addv/zaddv_generic.cpp b/gtestsuite/testsuite/level1/addv/zaddv_generic.cpp index 54cacf5f5..876a7b00e 100644 --- a/gtestsuite/testsuite/level1/addv/zaddv_generic.cpp +++ b/gtestsuite/testsuite/level1/addv/zaddv_generic.cpp @@ -83,7 +83,7 @@ public: gtint_t incx = std::get<2>(str.param); gtint_t incy = std::get<3>(str.param); std::string str_name = "bli_zaddv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/amaxv/camaxv_generic.cpp b/gtestsuite/testsuite/level1/amaxv/camaxv_generic.cpp index ae1d46884..b8cb8f5cf 100644 --- a/gtestsuite/testsuite/level1/amaxv/camaxv_generic.cpp +++ b/gtestsuite/testsuite/level1/amaxv/camaxv_generic.cpp @@ -74,7 +74,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/level1/amaxv/damaxv_evt_testing.cpp b/gtestsuite/testsuite/level1/amaxv/damaxv_evt_testing.cpp index 9e6e33f8a..5a7fa0f3e 100644 --- a/gtestsuite/testsuite/level1/amaxv/damaxv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/amaxv/damaxv_evt_testing.cpp @@ -90,7 +90,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_X_" + std::to_string(xi) + "_" + testinghelpers::get_value_string(xi_exval); str_name = str_name + "_" + std::to_string(xj) + "_" + testinghelpers::get_value_string(xj_exval); diff --git a/gtestsuite/testsuite/level1/amaxv/damaxv_generic.cpp b/gtestsuite/testsuite/level1/amaxv/damaxv_generic.cpp index 9f9994e44..0da6d3b3c 100644 --- a/gtestsuite/testsuite/level1/amaxv/damaxv_generic.cpp +++ b/gtestsuite/testsuite/level1/amaxv/damaxv_generic.cpp @@ -74,7 +74,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/level1/amaxv/samaxv_evt_testing.cpp b/gtestsuite/testsuite/level1/amaxv/samaxv_evt_testing.cpp index 687e566eb..9991bea8a 100644 --- a/gtestsuite/testsuite/level1/amaxv/samaxv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/amaxv/samaxv_evt_testing.cpp @@ -90,7 +90,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_X_" + std::to_string(xi) + "_" + testinghelpers::get_value_string(xi_exval); str_name = str_name + "_" + std::to_string(xj) + "_" + testinghelpers::get_value_string(xj_exval); diff --git a/gtestsuite/testsuite/level1/amaxv/samaxv_generic.cpp b/gtestsuite/testsuite/level1/amaxv/samaxv_generic.cpp index 05c872c59..f951c93db 100644 --- a/gtestsuite/testsuite/level1/amaxv/samaxv_generic.cpp +++ b/gtestsuite/testsuite/level1/amaxv/samaxv_generic.cpp @@ -74,7 +74,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/level1/amaxv/zamaxv_generic.cpp b/gtestsuite/testsuite/level1/amaxv/zamaxv_generic.cpp index d8ec646b3..669e033af 100644 --- a/gtestsuite/testsuite/level1/amaxv/zamaxv_generic.cpp +++ b/gtestsuite/testsuite/level1/amaxv/zamaxv_generic.cpp @@ -74,7 +74,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/level1/axpbyv/caxpbyv_generic.cpp b/gtestsuite/testsuite/level1/axpbyv/caxpbyv_generic.cpp index 98d05761d..e62614705 100644 --- a/gtestsuite/testsuite/level1/axpbyv/caxpbyv_generic.cpp +++ b/gtestsuite/testsuite/level1/axpbyv/caxpbyv_generic.cpp @@ -127,7 +127,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_caxpbyv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpbyv/daxpbyv_evt_testing.cpp b/gtestsuite/testsuite/level1/axpbyv/daxpbyv_evt_testing.cpp index 419ca5b70..ec1c28b06 100644 --- a/gtestsuite/testsuite/level1/axpbyv/daxpbyv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/axpbyv/daxpbyv_evt_testing.cpp @@ -145,7 +145,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); @@ -183,7 +183,7 @@ public: #else // #elif TEST_BLIS_TYPED std::string str_name = "bli_daxpbyv"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpbyv/daxpbyv_generic.cpp b/gtestsuite/testsuite/level1/axpbyv/daxpbyv_generic.cpp index db7a043c2..618dbf102 100644 --- a/gtestsuite/testsuite/level1/axpbyv/daxpbyv_generic.cpp +++ b/gtestsuite/testsuite/level1/axpbyv/daxpbyv_generic.cpp @@ -126,7 +126,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpbyv/saxpbyv_generic.cpp b/gtestsuite/testsuite/level1/axpbyv/saxpbyv_generic.cpp index 267b49573..f9f89ab4f 100644 --- a/gtestsuite/testsuite/level1/axpbyv/saxpbyv_generic.cpp +++ b/gtestsuite/testsuite/level1/axpbyv/saxpbyv_generic.cpp @@ -126,7 +126,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_saxpbyv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpbyv/zaxpbyv_evt_testing.cpp b/gtestsuite/testsuite/level1/axpbyv/zaxpbyv_evt_testing.cpp index c0453ac4f..26022ade1 100644 --- a/gtestsuite/testsuite/level1/axpbyv/zaxpbyv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/axpbyv/zaxpbyv_evt_testing.cpp @@ -145,7 +145,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); @@ -183,7 +183,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpbyv/zaxpbyv_generic.cpp b/gtestsuite/testsuite/level1/axpbyv/zaxpbyv_generic.cpp index a7525f2e9..a4d6ba56a 100644 --- a/gtestsuite/testsuite/level1/axpbyv/zaxpbyv_generic.cpp +++ b/gtestsuite/testsuite/level1/axpbyv/zaxpbyv_generic.cpp @@ -129,7 +129,7 @@ public: #else // #elif TEST_BLIS_TYPED std::string str_name = "bli_zaxpbyv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpyf/daxpyf_generic.cpp b/gtestsuite/testsuite/level1/axpyf/daxpyf_generic.cpp index a5e0696a8..f7207789d 100644 --- a/gtestsuite/testsuite/level1/axpyf/daxpyf_generic.cpp +++ b/gtestsuite/testsuite/level1/axpyf/daxpyf_generic.cpp @@ -116,8 +116,8 @@ public: std::string str_name = "bli_"; str_name += ( conja == 'n' )? "_conja_n" : "_conja_t"; str_name += ( conjx == 'n' )? "_conjx_n" : "_conjx_t"; - str_name += "_m" + std::to_string(m); - str_name += "_b" + std::to_string(b); + str_name += "_m_" + std::to_string(m); + str_name += "_b_" + std::to_string(b); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpyv/caxpyv_generic.cpp b/gtestsuite/testsuite/level1/axpyv/caxpyv_generic.cpp index 219e37c5b..28410547e 100644 --- a/gtestsuite/testsuite/level1/axpyv/caxpyv_generic.cpp +++ b/gtestsuite/testsuite/level1/axpyv/caxpyv_generic.cpp @@ -101,7 +101,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_caxpyv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpyv/daxpyv_evt_testing.cpp b/gtestsuite/testsuite/level1/axpyv/daxpyv_evt_testing.cpp index 2cd6338c8..3a8f04940 100644 --- a/gtestsuite/testsuite/level1/axpyv/daxpyv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/axpyv/daxpyv_evt_testing.cpp @@ -119,7 +119,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); @@ -155,7 +155,7 @@ public: #else // #elif TEST_BLIS_TYPED std::string str_name = "bli_daxpyv"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpyv/daxpyv_generic.cpp b/gtestsuite/testsuite/level1/axpyv/daxpyv_generic.cpp index 8a73b1458..75b2a0c06 100644 --- a/gtestsuite/testsuite/level1/axpyv/daxpyv_generic.cpp +++ b/gtestsuite/testsuite/level1/axpyv/daxpyv_generic.cpp @@ -99,7 +99,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpyv/saxpyv_evt_testing.cpp b/gtestsuite/testsuite/level1/axpyv/saxpyv_evt_testing.cpp index dd8ca4b49..8f8981151 100644 --- a/gtestsuite/testsuite/level1/axpyv/saxpyv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/axpyv/saxpyv_evt_testing.cpp @@ -117,7 +117,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "blis_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); @@ -153,7 +153,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "blis_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpyv/saxpyv_generic.cpp b/gtestsuite/testsuite/level1/axpyv/saxpyv_generic.cpp index dbc2cb7c1..9e87d27d4 100644 --- a/gtestsuite/testsuite/level1/axpyv/saxpyv_generic.cpp +++ b/gtestsuite/testsuite/level1/axpyv/saxpyv_generic.cpp @@ -99,7 +99,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "blis_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpyv/zaxpyv_evt_testing.cpp b/gtestsuite/testsuite/level1/axpyv/zaxpyv_evt_testing.cpp index b129d6e20..3fd574a45 100644 --- a/gtestsuite/testsuite/level1/axpyv/zaxpyv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/axpyv/zaxpyv_evt_testing.cpp @@ -122,7 +122,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "blis_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); @@ -158,7 +158,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "blis_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/axpyv/zaxpyv_generic.cpp b/gtestsuite/testsuite/level1/axpyv/zaxpyv_generic.cpp index 4acd6adc3..4e004663e 100644 --- a/gtestsuite/testsuite/level1/axpyv/zaxpyv_generic.cpp +++ b/gtestsuite/testsuite/level1/axpyv/zaxpyv_generic.cpp @@ -100,7 +100,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "blis_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/copyv/ccopyv_generic.cpp b/gtestsuite/testsuite/level1/copyv/ccopyv_generic.cpp index 3b7a16f3a..8a52a48b6 100644 --- a/gtestsuite/testsuite/level1/copyv/ccopyv_generic.cpp +++ b/gtestsuite/testsuite/level1/copyv/ccopyv_generic.cpp @@ -83,7 +83,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_ccopyv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/copyv/dcopyv_generic.cpp b/gtestsuite/testsuite/level1/copyv/dcopyv_generic.cpp index fa6794e43..f6de9348a 100644 --- a/gtestsuite/testsuite/level1/copyv/dcopyv_generic.cpp +++ b/gtestsuite/testsuite/level1/copyv/dcopyv_generic.cpp @@ -83,7 +83,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/copyv/scopyv_generic.cpp b/gtestsuite/testsuite/level1/copyv/scopyv_generic.cpp index 03cd8688c..88aca1287 100644 --- a/gtestsuite/testsuite/level1/copyv/scopyv_generic.cpp +++ b/gtestsuite/testsuite/level1/copyv/scopyv_generic.cpp @@ -83,7 +83,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_scopyv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/copyv/zcopyv_generic.cpp b/gtestsuite/testsuite/level1/copyv/zcopyv_generic.cpp index 3cba1b745..3d58a2aac 100644 --- a/gtestsuite/testsuite/level1/copyv/zcopyv_generic.cpp +++ b/gtestsuite/testsuite/level1/copyv/zcopyv_generic.cpp @@ -83,7 +83,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_zcopyv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/dotv/cdotv_generic.cpp b/gtestsuite/testsuite/level1/dotv/cdotv_generic.cpp index eeb206b7a..b9e166d46 100644 --- a/gtestsuite/testsuite/level1/dotv/cdotv_generic.cpp +++ b/gtestsuite/testsuite/level1/dotv/cdotv_generic.cpp @@ -98,7 +98,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_cdotv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_" + std::string(&conjy, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotv/ddotv_evt_testing.cpp b/gtestsuite/testsuite/level1/dotv/ddotv_evt_testing.cpp index 13959140a..97c979d92 100644 --- a/gtestsuite/testsuite/level1/dotv/ddotv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/dotv/ddotv_evt_testing.cpp @@ -111,7 +111,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_ddotv"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conjx == 'n') ? "_noconjx" : "_conjx"; str_name += (conjy == 'n') ? "_noconjy" : "_conjy"; str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotv/ddotv_generic.cpp b/gtestsuite/testsuite/level1/dotv/ddotv_generic.cpp index 2aac8b96e..7991ec2ca 100644 --- a/gtestsuite/testsuite/level1/dotv/ddotv_generic.cpp +++ b/gtestsuite/testsuite/level1/dotv/ddotv_generic.cpp @@ -97,7 +97,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_ddotv"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conjx == 'n') ? "_noconjx" : "_conjx"; str_name += (conjy == 'n') ? "_noconjy" : "_conjy"; str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotv/sdotv_generic.cpp b/gtestsuite/testsuite/level1/dotv/sdotv_generic.cpp index 07a062af1..803fdc90b 100644 --- a/gtestsuite/testsuite/level1/dotv/sdotv_generic.cpp +++ b/gtestsuite/testsuite/level1/dotv/sdotv_generic.cpp @@ -97,7 +97,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_sdotv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_" + std::string(&conjy, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotv/zdotv_generic.cpp b/gtestsuite/testsuite/level1/dotv/zdotv_generic.cpp index 6ff48b910..cc7995d9f 100644 --- a/gtestsuite/testsuite/level1/dotv/zdotv_generic.cpp +++ b/gtestsuite/testsuite/level1/dotv/zdotv_generic.cpp @@ -98,7 +98,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_zdotv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_" + std::string(&conjy, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotxf/ddotxf_generic.cpp b/gtestsuite/testsuite/level1/dotxf/ddotxf_generic.cpp index 1ffaa13a8..7e0ce6c03 100644 --- a/gtestsuite/testsuite/level1/dotxf/ddotxf_generic.cpp +++ b/gtestsuite/testsuite/level1/dotxf/ddotxf_generic.cpp @@ -133,8 +133,8 @@ public: str_name += ( conja == 'n' )? "_conja_n" : "_conja_t"; str_name += ( conjx == 'n' )? "_conjx_n" : "_conjx_t"; - str_name += "_m" + std::to_string(m); - str_name += "_b" + std::to_string(b); + str_name += "_m_" + std::to_string(m); + str_name += "_b_" + std::to_string(b); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotxv/cdotxv_generic.cpp b/gtestsuite/testsuite/level1/dotxv/cdotxv_generic.cpp index ef507cbb7..979ecdc21 100644 --- a/gtestsuite/testsuite/level1/dotxv/cdotxv_generic.cpp +++ b/gtestsuite/testsuite/level1/dotxv/cdotxv_generic.cpp @@ -121,7 +121,7 @@ public: scomplex alpha = std::get<5>(str.param); scomplex beta = std::get<6>(str.param); std::string str_name = "bli_cdotxv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_" + std::string(&conjy, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotxv/ddotxv_generic.cpp b/gtestsuite/testsuite/level1/dotxv/ddotxv_generic.cpp index 133946dc6..cedaf0b3a 100644 --- a/gtestsuite/testsuite/level1/dotxv/ddotxv_generic.cpp +++ b/gtestsuite/testsuite/level1/dotxv/ddotxv_generic.cpp @@ -120,7 +120,7 @@ public: double alpha = std::get<5>(str.param); double beta = std::get<6>(str.param); std::string str_name = "bli_ddotxv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_" + std::string(&conjy, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotxv/sdotxv_generic.cpp b/gtestsuite/testsuite/level1/dotxv/sdotxv_generic.cpp index 77d76ac6b..fe8659966 100644 --- a/gtestsuite/testsuite/level1/dotxv/sdotxv_generic.cpp +++ b/gtestsuite/testsuite/level1/dotxv/sdotxv_generic.cpp @@ -120,7 +120,7 @@ public: float alpha = std::get<5>(str.param); float beta = std::get<6>(str.param); std::string str_name = "bli_sdotxv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_" + std::string(&conjy, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/dotxv/zdotxv_generic.cpp b/gtestsuite/testsuite/level1/dotxv/zdotxv_generic.cpp index 3c7be12a9..e4b1ea993 100644 --- a/gtestsuite/testsuite/level1/dotxv/zdotxv_generic.cpp +++ b/gtestsuite/testsuite/level1/dotxv/zdotxv_generic.cpp @@ -121,7 +121,7 @@ public: dcomplex alpha = std::get<5>(str.param); dcomplex beta = std::get<6>(str.param); std::string str_name = "bli_zdotxv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conjx, 1); str_name += "_" + std::string(&conjy, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level1/scal2v/cscal2v_generic.cpp b/gtestsuite/testsuite/level1/scal2v/cscal2v_generic.cpp index 3660bd611..8491218e5 100644 --- a/gtestsuite/testsuite/level1/scal2v/cscal2v_generic.cpp +++ b/gtestsuite/testsuite/level1/scal2v/cscal2v_generic.cpp @@ -96,7 +96,7 @@ public: gtint_t incy = std::get<3>(str.param); scomplex alpha = std::get<4>(str.param); std::string str_name = "bli_cscal2v"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/scal2v/dscal2v_generic.cpp b/gtestsuite/testsuite/level1/scal2v/dscal2v_generic.cpp index d9090346e..9d4bac9e3 100644 --- a/gtestsuite/testsuite/level1/scal2v/dscal2v_generic.cpp +++ b/gtestsuite/testsuite/level1/scal2v/dscal2v_generic.cpp @@ -95,7 +95,7 @@ public: gtint_t incy = std::get<3>(str.param); double alpha = std::get<4>(str.param); std::string str_name = "bli_dscal2v"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/scal2v/sscal2v_generic.cpp b/gtestsuite/testsuite/level1/scal2v/sscal2v_generic.cpp index e242c043a..c59ec45af 100644 --- a/gtestsuite/testsuite/level1/scal2v/sscal2v_generic.cpp +++ b/gtestsuite/testsuite/level1/scal2v/sscal2v_generic.cpp @@ -95,7 +95,7 @@ public: gtint_t incy = std::get<3>(str.param); float alpha = std::get<4>(str.param); std::string str_name = "bli_sscal2v"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/scal2v/zscal2v_generic.cpp b/gtestsuite/testsuite/level1/scal2v/zscal2v_generic.cpp index eb8a3b2d7..e0ce0d1ac 100644 --- a/gtestsuite/testsuite/level1/scal2v/zscal2v_generic.cpp +++ b/gtestsuite/testsuite/level1/scal2v/zscal2v_generic.cpp @@ -97,7 +97,7 @@ public: gtint_t incy = std::get<3>(str.param); dcomplex alpha = std::get<4>(str.param); std::string str_name = "bli_zscal2v"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/scalv/cscalv_generic.cpp b/gtestsuite/testsuite/level1/scalv/cscalv_generic.cpp index 35f415b19..f8a8f08b3 100644 --- a/gtestsuite/testsuite/level1/scalv/cscalv_generic.cpp +++ b/gtestsuite/testsuite/level1/scalv/cscalv_generic.cpp @@ -97,7 +97,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_cscalv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level1/scalv/dscalv_evt_testing.cpp b/gtestsuite/testsuite/level1/scalv/dscalv_evt_testing.cpp index 7cfb41a17..c84271ca5 100644 --- a/gtestsuite/testsuite/level1/scalv/dscalv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/scalv/dscalv_evt_testing.cpp @@ -101,7 +101,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_dscalv"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conjx == 'n') ? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_X_" + std::to_string(xi); diff --git a/gtestsuite/testsuite/level1/scalv/dscalv_generic.cpp b/gtestsuite/testsuite/level1/scalv/dscalv_generic.cpp index 053f5fb2f..2845138d7 100644 --- a/gtestsuite/testsuite/level1/scalv/dscalv_generic.cpp +++ b/gtestsuite/testsuite/level1/scalv/dscalv_generic.cpp @@ -96,7 +96,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_dscalv"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conjx == 'n') ? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level1/scalv/sscalv_generic.cpp b/gtestsuite/testsuite/level1/scalv/sscalv_generic.cpp index 86598acba..2fd731fa1 100644 --- a/gtestsuite/testsuite/level1/scalv/sscalv_generic.cpp +++ b/gtestsuite/testsuite/level1/scalv/sscalv_generic.cpp @@ -96,7 +96,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_sscalv"; #endif - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level1/scalv/zdscalv_evt_testing.cpp b/gtestsuite/testsuite/level1/scalv/zdscalv_evt_testing.cpp index c045ad8e3..07d90d36e 100644 --- a/gtestsuite/testsuite/level1/scalv/zdscalv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/scalv/zdscalv_evt_testing.cpp @@ -106,7 +106,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "blis_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conj == 'n') ? "_noconj" : "_conj"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_X_" + std::to_string(xi); diff --git a/gtestsuite/testsuite/level1/scalv/zdscalv_generic.cpp b/gtestsuite/testsuite/level1/scalv/zdscalv_generic.cpp index 6f46af874..ab7e46581 100644 --- a/gtestsuite/testsuite/level1/scalv/zdscalv_generic.cpp +++ b/gtestsuite/testsuite/level1/scalv/zdscalv_generic.cpp @@ -98,7 +98,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conj_alpha == 'n') ? "_noconjalpha" : "_conjalpha"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level1/scalv/zscalv_evt_testing.cpp b/gtestsuite/testsuite/level1/scalv/zscalv_evt_testing.cpp index e2b8a8e08..7b34a5483 100644 --- a/gtestsuite/testsuite/level1/scalv/zscalv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/scalv/zscalv_evt_testing.cpp @@ -105,7 +105,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "blis_"; #endif - str_name += "n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conj == 'n') ? "_noconj" : "_conj"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_X_" + std::to_string(xi); diff --git a/gtestsuite/testsuite/level1/scalv/zscalv_generic.cpp b/gtestsuite/testsuite/level1/scalv/zscalv_generic.cpp index f3ab33cd9..0aad9274b 100644 --- a/gtestsuite/testsuite/level1/scalv/zscalv_generic.cpp +++ b/gtestsuite/testsuite/level1/scalv/zscalv_generic.cpp @@ -97,7 +97,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_"; #endif - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conj_alpha == 'n') ? "_noconjalpha" : "_conjalpha"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level1/setv/csetv_generic.cpp b/gtestsuite/testsuite/level1/setv/csetv_generic.cpp index 9f9442347..67700988f 100644 --- a/gtestsuite/testsuite/level1/setv/csetv_generic.cpp +++ b/gtestsuite/testsuite/level1/setv/csetv_generic.cpp @@ -70,7 +70,7 @@ public: gtint_t n = std::get<1>(str.param); gtint_t incx = std::get<2>(str.param); std::string str_name = "bli_csetv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; diff --git a/gtestsuite/testsuite/level1/setv/dsetv_generic.cpp b/gtestsuite/testsuite/level1/setv/dsetv_generic.cpp index f87aa7b2f..d5909d255 100644 --- a/gtestsuite/testsuite/level1/setv/dsetv_generic.cpp +++ b/gtestsuite/testsuite/level1/setv/dsetv_generic.cpp @@ -70,7 +70,7 @@ public: gtint_t n = std::get<1>(str.param); gtint_t incx = std::get<2>(str.param); std::string str_name = "bli_dsetv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; diff --git a/gtestsuite/testsuite/level1/setv/ssetv_generic.cpp b/gtestsuite/testsuite/level1/setv/ssetv_generic.cpp index d6a1212e2..e64e80080 100644 --- a/gtestsuite/testsuite/level1/setv/ssetv_generic.cpp +++ b/gtestsuite/testsuite/level1/setv/ssetv_generic.cpp @@ -70,7 +70,7 @@ public: gtint_t n = std::get<1>(str.param); gtint_t incx = std::get<2>(str.param); std::string str_name = "bli_ssetv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; diff --git a/gtestsuite/testsuite/level1/setv/zsetv_generic.cpp b/gtestsuite/testsuite/level1/setv/zsetv_generic.cpp index 4e4cd6896..0ab9e0c32 100644 --- a/gtestsuite/testsuite/level1/setv/zsetv_generic.cpp +++ b/gtestsuite/testsuite/level1/setv/zsetv_generic.cpp @@ -70,7 +70,7 @@ public: gtint_t n = std::get<1>(str.param); gtint_t incx = std::get<2>(str.param); std::string str_name = "bli_zsetv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; diff --git a/gtestsuite/testsuite/level1/subv/csubv_evt_testing.cpp b/gtestsuite/testsuite/level1/subv/csubv_evt_testing.cpp index 1d6e59f8b..ef6617610 100644 --- a/gtestsuite/testsuite/level1/subv/csubv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/subv/csubv_evt_testing.cpp @@ -105,7 +105,7 @@ public: gtint_t yj = std::get<6>(str.param); scomplex yexval = std::get<7>(str.param); std::string str_name = "bli_"; - str_name += "n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/subv/dsubv_evt_testing.cpp b/gtestsuite/testsuite/level1/subv/dsubv_evt_testing.cpp index 7bbe5b8b4..8b4128152 100644 --- a/gtestsuite/testsuite/level1/subv/dsubv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/subv/dsubv_evt_testing.cpp @@ -105,7 +105,7 @@ public: gtint_t yj = std::get<6>(str.param); double yexval = std::get<7>(str.param); std::string str_name = "bli_"; - str_name += "n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/subv/ssubv_evt_testing.cpp b/gtestsuite/testsuite/level1/subv/ssubv_evt_testing.cpp index af9f714c2..2898cac27 100644 --- a/gtestsuite/testsuite/level1/subv/ssubv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/subv/ssubv_evt_testing.cpp @@ -105,7 +105,7 @@ public: gtint_t yj = std::get<6>(str.param); float yexval = std::get<7>(str.param); std::string str_name = "bli_"; - str_name += "n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/subv/zsubv_evt_testing.cpp b/gtestsuite/testsuite/level1/subv/zsubv_evt_testing.cpp index f937da588..05c209326 100644 --- a/gtestsuite/testsuite/level1/subv/zsubv_evt_testing.cpp +++ b/gtestsuite/testsuite/level1/subv/zsubv_evt_testing.cpp @@ -105,7 +105,7 @@ public: gtint_t yj = std::get<6>(str.param); dcomplex yexval = std::get<7>(str.param); std::string str_name = "bli_"; - str_name += "n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/xpbyv/cxpbyv_generic.cpp b/gtestsuite/testsuite/level1/xpbyv/cxpbyv_generic.cpp index da18f32fb..40e1bce9c 100644 --- a/gtestsuite/testsuite/level1/xpbyv/cxpbyv_generic.cpp +++ b/gtestsuite/testsuite/level1/xpbyv/cxpbyv_generic.cpp @@ -98,7 +98,7 @@ public: gtint_t incy = std::get<3>(str.param); scomplex beta = std::get<4>(str.param); std::string str_name = "bli_cxpbyv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/xpbyv/dxpbyv_generic.cpp b/gtestsuite/testsuite/level1/xpbyv/dxpbyv_generic.cpp index 6349f9ed7..2d294e492 100644 --- a/gtestsuite/testsuite/level1/xpbyv/dxpbyv_generic.cpp +++ b/gtestsuite/testsuite/level1/xpbyv/dxpbyv_generic.cpp @@ -97,7 +97,7 @@ public: gtint_t incy = std::get<3>(str.param); double beta = std::get<4>(str.param); std::string str_name = "bli_dxpbyv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/xpbyv/sxpbyv_generic.cpp b/gtestsuite/testsuite/level1/xpbyv/sxpbyv_generic.cpp index e6f7c832b..1ba5f1d31 100644 --- a/gtestsuite/testsuite/level1/xpbyv/sxpbyv_generic.cpp +++ b/gtestsuite/testsuite/level1/xpbyv/sxpbyv_generic.cpp @@ -97,7 +97,7 @@ public: gtint_t incy = std::get<3>(str.param); float beta = std::get<4>(str.param); std::string str_name = "bli_sxpbyv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level1/xpbyv/zxpbyv_generic.cpp b/gtestsuite/testsuite/level1/xpbyv/zxpbyv_generic.cpp index d68441dd7..523f3b97e 100644 --- a/gtestsuite/testsuite/level1/xpbyv/zxpbyv_generic.cpp +++ b/gtestsuite/testsuite/level1/xpbyv/zxpbyv_generic.cpp @@ -98,7 +98,7 @@ public: gtint_t incy = std::get<3>(str.param); dcomplex beta = std::get<4>(str.param); std::string str_name = "bli_zxpbyv"; - str_name += "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_" + std::string(&conj, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level2/gemv/cgemv_evt_testing.cpp b/gtestsuite/testsuite/level2/gemv/cgemv_evt_testing.cpp index b65cee070..18d141954 100644 --- a/gtestsuite/testsuite/level2/gemv/cgemv_evt_testing.cpp +++ b/gtestsuite/testsuite/level2/gemv/cgemv_evt_testing.cpp @@ -144,8 +144,8 @@ public: str_name = str_name + "stor_" + sfm; str_name = str_name + "_transa_" + transa; str_name = str_name + "_conjx_" + conjx; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/gemv/cgemv_generic.cpp b/gtestsuite/testsuite/level2/gemv/cgemv_generic.cpp index ffd62b0cc..eeb46879b 100644 --- a/gtestsuite/testsuite/level2/gemv/cgemv_generic.cpp +++ b/gtestsuite/testsuite/level2/gemv/cgemv_generic.cpp @@ -131,8 +131,8 @@ public: str_name = str_name + "stor_" + sfm; str_name = str_name + "_transa_" + transa; str_name = str_name + "_conjx_" + conjx; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/gemv/dgemv_evt_testing.cpp b/gtestsuite/testsuite/level2/gemv/dgemv_evt_testing.cpp index 7c401ea9e..594b0dbf2 100644 --- a/gtestsuite/testsuite/level2/gemv/dgemv_evt_testing.cpp +++ b/gtestsuite/testsuite/level2/gemv/dgemv_evt_testing.cpp @@ -143,8 +143,8 @@ public: str_name = str_name + "stor_" + sfm; str_name = str_name + "_transa_" + transa; str_name = str_name + "_conjx_" + conjx; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/gemv/dgemv_generic.cpp b/gtestsuite/testsuite/level2/gemv/dgemv_generic.cpp index 044f3d55b..5ac4e2cc7 100644 --- a/gtestsuite/testsuite/level2/gemv/dgemv_generic.cpp +++ b/gtestsuite/testsuite/level2/gemv/dgemv_generic.cpp @@ -130,8 +130,8 @@ public: str_name = str_name + "stor_" + sfm; str_name = str_name + "_transa_" + transa; str_name = str_name + "_conjx_" + conjx; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/gemv/sgemv_evt_testing.cpp b/gtestsuite/testsuite/level2/gemv/sgemv_evt_testing.cpp index 254c801f0..875d048a8 100644 --- a/gtestsuite/testsuite/level2/gemv/sgemv_evt_testing.cpp +++ b/gtestsuite/testsuite/level2/gemv/sgemv_evt_testing.cpp @@ -143,8 +143,8 @@ public: str_name = str_name + "stor_" + sfm; str_name = str_name + "_transa_" + transa; str_name = str_name + "_conjx_" + conjx; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/gemv/sgemv_generic.cpp b/gtestsuite/testsuite/level2/gemv/sgemv_generic.cpp index e7457d0dc..2208218b9 100644 --- a/gtestsuite/testsuite/level2/gemv/sgemv_generic.cpp +++ b/gtestsuite/testsuite/level2/gemv/sgemv_generic.cpp @@ -128,8 +128,8 @@ public: str_name = str_name + "stor_" + sfm; str_name = str_name + "_transa_" + transa; str_name = str_name + "_conjx_" + conjx; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/gemv/zgemv_evt_testing.cpp b/gtestsuite/testsuite/level2/gemv/zgemv_evt_testing.cpp index bd00726fe..baa32bd63 100644 --- a/gtestsuite/testsuite/level2/gemv/zgemv_evt_testing.cpp +++ b/gtestsuite/testsuite/level2/gemv/zgemv_evt_testing.cpp @@ -144,8 +144,8 @@ public: str_name = str_name + "stor_" + sfm; str_name = str_name + "_transa_" + transa; str_name = str_name + "_conjx_" + conjx; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/gemv/zgemv_generic.cpp b/gtestsuite/testsuite/level2/gemv/zgemv_generic.cpp index ea608f53d..eafde88b4 100644 --- a/gtestsuite/testsuite/level2/gemv/zgemv_generic.cpp +++ b/gtestsuite/testsuite/level2/gemv/zgemv_generic.cpp @@ -130,8 +130,8 @@ public: str_name = str_name + "stor_" + sfm; str_name = str_name + "_transa_" + transa; str_name = str_name + "_conjx_" + conjx; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/ger/cger_evt.cpp b/gtestsuite/testsuite/level2/ger/cger_evt.cpp index 303f4467d..b862d7527 100644 --- a/gtestsuite/testsuite/level2/ger/cger_evt.cpp +++ b/gtestsuite/testsuite/level2/ger/cger_evt.cpp @@ -150,8 +150,8 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + conjx+conjy; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name = str_name + "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/ger/cger_generic.cpp b/gtestsuite/testsuite/level2/ger/cger_generic.cpp index 16aae265e..999d1afc4 100644 --- a/gtestsuite/testsuite/level2/ger/cger_generic.cpp +++ b/gtestsuite/testsuite/level2/ger/cger_generic.cpp @@ -112,8 +112,8 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + conjx+conjy; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name = str_name + "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/ger/dger_evt.cpp b/gtestsuite/testsuite/level2/ger/dger_evt.cpp index d892915ee..c0b9c301f 100644 --- a/gtestsuite/testsuite/level2/ger/dger_evt.cpp +++ b/gtestsuite/testsuite/level2/ger/dger_evt.cpp @@ -149,8 +149,8 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + conjx+conjy; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name = str_name + "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/ger/dger_generic.cpp b/gtestsuite/testsuite/level2/ger/dger_generic.cpp index bd8f7fcea..36b5925d3 100644 --- a/gtestsuite/testsuite/level2/ger/dger_generic.cpp +++ b/gtestsuite/testsuite/level2/ger/dger_generic.cpp @@ -112,8 +112,8 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + conjx+conjy; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name = str_name + "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/ger/sger_evt.cpp b/gtestsuite/testsuite/level2/ger/sger_evt.cpp index ef896dc21..0bcb0d463 100644 --- a/gtestsuite/testsuite/level2/ger/sger_evt.cpp +++ b/gtestsuite/testsuite/level2/ger/sger_evt.cpp @@ -149,8 +149,8 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + conjx+conjy; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name = str_name + "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/ger/sger_generic.cpp b/gtestsuite/testsuite/level2/ger/sger_generic.cpp index b3ff25328..2b79137b9 100644 --- a/gtestsuite/testsuite/level2/ger/sger_generic.cpp +++ b/gtestsuite/testsuite/level2/ger/sger_generic.cpp @@ -112,8 +112,8 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + conjx+conjy; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name = str_name + "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/ger/zger_evt.cpp b/gtestsuite/testsuite/level2/ger/zger_evt.cpp index 44c8fe972..0d5ceff1d 100644 --- a/gtestsuite/testsuite/level2/ger/zger_evt.cpp +++ b/gtestsuite/testsuite/level2/ger/zger_evt.cpp @@ -150,8 +150,8 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + conjx+conjy; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name = str_name + "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/ger/zger_generic.cpp b/gtestsuite/testsuite/level2/ger/zger_generic.cpp index 6faac3cad..e7f445b80 100644 --- a/gtestsuite/testsuite/level2/ger/zger_generic.cpp +++ b/gtestsuite/testsuite/level2/ger/zger_generic.cpp @@ -112,8 +112,8 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + conjx+conjy; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); str_name = str_name + "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level2/hemv/chemv_generic.cpp b/gtestsuite/testsuite/level2/hemv/chemv_generic.cpp index 51bee26a6..8ae718614 100644 --- a/gtestsuite/testsuite/level2/hemv/chemv_generic.cpp +++ b/gtestsuite/testsuite/level2/hemv/chemv_generic.cpp @@ -121,7 +121,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conja+conjx; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level2/hemv/zhemv_generic.cpp b/gtestsuite/testsuite/level2/hemv/zhemv_generic.cpp index 7038141ce..1cfaa217f 100644 --- a/gtestsuite/testsuite/level2/hemv/zhemv_generic.cpp +++ b/gtestsuite/testsuite/level2/hemv/zhemv_generic.cpp @@ -121,7 +121,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conja+conjx; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level2/her/cher_generic.cpp b/gtestsuite/testsuite/level2/her/cher_generic.cpp index f7bf4d513..008ca1689 100644 --- a/gtestsuite/testsuite/level2/her/cher_generic.cpp +++ b/gtestsuite/testsuite/level2/her/cher_generic.cpp @@ -105,7 +105,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conjx; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/her/zher_generic.cpp b/gtestsuite/testsuite/level2/her/zher_generic.cpp index 69ace73b0..db4297012 100644 --- a/gtestsuite/testsuite/level2/her/zher_generic.cpp +++ b/gtestsuite/testsuite/level2/her/zher_generic.cpp @@ -105,7 +105,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conjx; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/her2/cher2_generic.cpp b/gtestsuite/testsuite/level2/her2/cher2_generic.cpp index b27d371ea..848d41e8a 100644 --- a/gtestsuite/testsuite/level2/her2/cher2_generic.cpp +++ b/gtestsuite/testsuite/level2/her2/cher2_generic.cpp @@ -113,7 +113,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conjx+conjy; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level2/her2/zher2_generic.cpp b/gtestsuite/testsuite/level2/her2/zher2_generic.cpp index ffa24e933..d12be1677 100644 --- a/gtestsuite/testsuite/level2/her2/zher2_generic.cpp +++ b/gtestsuite/testsuite/level2/her2/zher2_generic.cpp @@ -113,7 +113,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conjx+conjy; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level2/symv/dsymv_generic.cpp b/gtestsuite/testsuite/level2/symv/dsymv_generic.cpp index 56ae266c8..17f2283bc 100644 --- a/gtestsuite/testsuite/level2/symv/dsymv_generic.cpp +++ b/gtestsuite/testsuite/level2/symv/dsymv_generic.cpp @@ -120,7 +120,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conja+conjx; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level2/symv/ssymv_generic.cpp b/gtestsuite/testsuite/level2/symv/ssymv_generic.cpp index 1e7de7ab6..e80e14e61 100644 --- a/gtestsuite/testsuite/level2/symv/ssymv_generic.cpp +++ b/gtestsuite/testsuite/level2/symv/ssymv_generic.cpp @@ -120,7 +120,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conja+conjx; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/level2/syr/dsyr_generic.cpp b/gtestsuite/testsuite/level2/syr/dsyr_generic.cpp index 71c5fabbe..09e4c7265 100644 --- a/gtestsuite/testsuite/level2/syr/dsyr_generic.cpp +++ b/gtestsuite/testsuite/level2/syr/dsyr_generic.cpp @@ -104,7 +104,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conjx; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/syr/ssyr_generic.cpp b/gtestsuite/testsuite/level2/syr/ssyr_generic.cpp index b489126db..939f3206d 100644 --- a/gtestsuite/testsuite/level2/syr/ssyr_generic.cpp +++ b/gtestsuite/testsuite/level2/syr/ssyr_generic.cpp @@ -104,7 +104,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conjx; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/syr2/dsyr2_generic.cpp b/gtestsuite/testsuite/level2/syr2/dsyr2_generic.cpp index 22b1ca911..7682bbb95 100644 --- a/gtestsuite/testsuite/level2/syr2/dsyr2_generic.cpp +++ b/gtestsuite/testsuite/level2/syr2/dsyr2_generic.cpp @@ -112,7 +112,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conjx+conjy; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level2/syr2/ssyr2_generic.cpp b/gtestsuite/testsuite/level2/syr2/ssyr2_generic.cpp index a45bedc8a..fee8a5762 100644 --- a/gtestsuite/testsuite/level2/syr2/ssyr2_generic.cpp +++ b/gtestsuite/testsuite/level2/syr2/ssyr2_generic.cpp @@ -112,7 +112,7 @@ public: #endif str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+conjx+conjy; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/level2/trmv/ctrmv_generic.cpp b/gtestsuite/testsuite/level2/trmv/ctrmv_generic.cpp index 2c59b262d..fdce73c79 100644 --- a/gtestsuite/testsuite/level2/trmv/ctrmv_generic.cpp +++ b/gtestsuite/testsuite/level2/trmv/ctrmv_generic.cpp @@ -110,7 +110,7 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/trmv/dtrmv_generic.cpp b/gtestsuite/testsuite/level2/trmv/dtrmv_generic.cpp index 6cc6cd7f2..01aa9dc77 100644 --- a/gtestsuite/testsuite/level2/trmv/dtrmv_generic.cpp +++ b/gtestsuite/testsuite/level2/trmv/dtrmv_generic.cpp @@ -109,7 +109,7 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/trmv/strmv_generic.cpp b/gtestsuite/testsuite/level2/trmv/strmv_generic.cpp index d2e7d72e9..593956aa0 100644 --- a/gtestsuite/testsuite/level2/trmv/strmv_generic.cpp +++ b/gtestsuite/testsuite/level2/trmv/strmv_generic.cpp @@ -109,7 +109,7 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/trmv/ztrmv_generic.cpp b/gtestsuite/testsuite/level2/trmv/ztrmv_generic.cpp index a3fad4b56..6372e41f9 100644 --- a/gtestsuite/testsuite/level2/trmv/ztrmv_generic.cpp +++ b/gtestsuite/testsuite/level2/trmv/ztrmv_generic.cpp @@ -110,7 +110,7 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/trsv/ctrsv_generic.cpp b/gtestsuite/testsuite/level2/trsv/ctrsv_generic.cpp index f2443f987..ac0b6f54a 100644 --- a/gtestsuite/testsuite/level2/trsv/ctrsv_generic.cpp +++ b/gtestsuite/testsuite/level2/trsv/ctrsv_generic.cpp @@ -110,7 +110,7 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/trsv/dtrsv_evt_testing.cpp b/gtestsuite/testsuite/level2/trsv/dtrsv_evt_testing.cpp index aa173e0c6..8bd64857e 100644 --- a/gtestsuite/testsuite/level2/trsv/dtrsv_evt_testing.cpp +++ b/gtestsuite/testsuite/level2/trsv/dtrsv_evt_testing.cpp @@ -119,7 +119,7 @@ public: str_name = str_name + "_uplo_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diaga_" + diaga; - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_ex_x_" + testinghelpers::get_value_string(xexval); diff --git a/gtestsuite/testsuite/level2/trsv/dtrsv_generic.cpp b/gtestsuite/testsuite/level2/trsv/dtrsv_generic.cpp index 0cce50c98..689b02a47 100644 --- a/gtestsuite/testsuite/level2/trsv/dtrsv_generic.cpp +++ b/gtestsuite/testsuite/level2/trsv/dtrsv_generic.cpp @@ -113,7 +113,7 @@ public: str_name = str_name + "_uplo_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diaga_" + diaga; - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_lda_" + std::to_string( diff --git a/gtestsuite/testsuite/level2/trsv/strsv_generic.cpp b/gtestsuite/testsuite/level2/trsv/strsv_generic.cpp index 1f88fa1a2..a17b3c402 100644 --- a/gtestsuite/testsuite/level2/trsv/strsv_generic.cpp +++ b/gtestsuite/testsuite/level2/trsv/strsv_generic.cpp @@ -109,7 +109,7 @@ public: str_name = str_name + "_" + sfm; str_name = str_name + "_" + uploa+transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_" + std::to_string(ld_inc); diff --git a/gtestsuite/testsuite/level2/trsv/ztrsv_evt_testing.cpp b/gtestsuite/testsuite/level2/trsv/ztrsv_evt_testing.cpp index 157c39828..6e7ff989f 100644 --- a/gtestsuite/testsuite/level2/trsv/ztrsv_evt_testing.cpp +++ b/gtestsuite/testsuite/level2/trsv/ztrsv_evt_testing.cpp @@ -119,7 +119,7 @@ public: str_name = str_name + "_uplo_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diaga_" + diaga; - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_ex_x_" + testinghelpers::get_value_string(xexval); diff --git a/gtestsuite/testsuite/level2/trsv/ztrsv_generic.cpp b/gtestsuite/testsuite/level2/trsv/ztrsv_generic.cpp index d016beee5..79e89e9e1 100644 --- a/gtestsuite/testsuite/level2/trsv/ztrsv_generic.cpp +++ b/gtestsuite/testsuite/level2/trsv/ztrsv_generic.cpp @@ -114,7 +114,7 @@ public: str_name = str_name + "_uplo_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diaga_" + diaga; - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_lda_" + std::to_string( diff --git a/gtestsuite/testsuite/level3/gemm/cgemm_evt_testing.cpp b/gtestsuite/testsuite/level3/gemm/cgemm_evt_testing.cpp index 1eb14fd43..1072f30b0 100644 --- a/gtestsuite/testsuite/level3/gemm/cgemm_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/gemm/cgemm_evt_testing.cpp @@ -173,9 +173,9 @@ public: #endif str_name = str_name + "storageOfMatrix_" + sfm; str_name = str_name + "_transA_" + tsa + "_transB_" + tsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name = str_name + "_A" + std::to_string(ai) + std::to_string(aj); str_name = str_name + "_" + testinghelpers::get_value_string(aex); str_name = str_name + "_B" + std::to_string(bi) + std::to_string(bj); diff --git a/gtestsuite/testsuite/level3/gemm/cgemm_generic.cpp b/gtestsuite/testsuite/level3/gemm/cgemm_generic.cpp index a20101884..fea15e799 100644 --- a/gtestsuite/testsuite/level3/gemm/cgemm_generic.cpp +++ b/gtestsuite/testsuite/level3/gemm/cgemm_generic.cpp @@ -120,9 +120,9 @@ public: #endif str_name = str_name + "storageOfMatrix_" + sfm; str_name = str_name + "_transA_" + tsa + "_transB_" + tsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); gtint_t lda = testinghelpers::get_leading_dimension( sfm, tsa, m, k, lda_inc ); diff --git a/gtestsuite/testsuite/level3/gemm/dgemm_evt_testing.cpp b/gtestsuite/testsuite/level3/gemm/dgemm_evt_testing.cpp index c1c5c073d..258f34526 100644 --- a/gtestsuite/testsuite/level3/gemm/dgemm_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/gemm/dgemm_evt_testing.cpp @@ -167,9 +167,9 @@ public: #endif str_name = str_name + "C_matrix_storage_" + sfm; str_name = str_name + "_transA_" + tsa + "_transB_" + tsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name = str_name + "_A" + std::to_string(ai) + std::to_string(aj); str_name = str_name + "_" + testinghelpers::get_value_string(aex); str_name = str_name + "_B" + std::to_string(bi) + std::to_string(bj); diff --git a/gtestsuite/testsuite/level3/gemm/dgemm_generic.cpp b/gtestsuite/testsuite/level3/gemm/dgemm_generic.cpp index b00fcc3f1..181c07833 100644 --- a/gtestsuite/testsuite/level3/gemm/dgemm_generic.cpp +++ b/gtestsuite/testsuite/level3/gemm/dgemm_generic.cpp @@ -124,9 +124,9 @@ public: #endif str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/gemm/dgemm_ovr_undr.cpp b/gtestsuite/testsuite/level3/gemm/dgemm_ovr_undr.cpp index 60031d84e..3896d9bbf 100644 --- a/gtestsuite/testsuite/level3/gemm/dgemm_ovr_undr.cpp +++ b/gtestsuite/testsuite/level3/gemm/dgemm_ovr_undr.cpp @@ -154,9 +154,9 @@ class DGEMMOUTestPrint { str_name = str_name + "_" + over_under_str; std::string input_range_str = (input_range < 0) ? "within_limit": (input_range > 0) ? "beyond_limit" : "close_to_limit"; str_name = str_name + "_" + input_range_str; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name = str_name + "_A_" + std::to_string(ai) + "_" + std::to_string(aj); str_name = str_name + "_B_" + std::to_string(bi) + "_" + std::to_string(bj); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/level3/gemm/sgemm_evt_testing.cpp b/gtestsuite/testsuite/level3/gemm/sgemm_evt_testing.cpp index 8c179cddd..93ff2c6e1 100644 --- a/gtestsuite/testsuite/level3/gemm/sgemm_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/gemm/sgemm_evt_testing.cpp @@ -157,9 +157,9 @@ public: #endif str_name = str_name + "storageC_" + sfm; str_name = str_name + "_transA_" + tsa + "_transB_" + tsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name = str_name + "_A" + std::to_string(ai) + std::to_string(aj); str_name = str_name + "_" + testinghelpers::get_value_string(aex); str_name = str_name + "_B" + std::to_string(bi) + std::to_string(bj); diff --git a/gtestsuite/testsuite/level3/gemm/sgemm_generic.cpp b/gtestsuite/testsuite/level3/gemm/sgemm_generic.cpp index 028a18057..0cacae99e 100644 --- a/gtestsuite/testsuite/level3/gemm/sgemm_generic.cpp +++ b/gtestsuite/testsuite/level3/gemm/sgemm_generic.cpp @@ -124,9 +124,9 @@ public: #endif str_name = str_name + "storageC_" + sfm; str_name = str_name + "_transA_" + tsa + tsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); gtint_t lda = testinghelpers::get_leading_dimension( sfm, tsa, m, k, lda_inc ); diff --git a/gtestsuite/testsuite/level3/gemm/zgemm_evt_testing.cpp b/gtestsuite/testsuite/level3/gemm/zgemm_evt_testing.cpp index 019bc4f52..970b06fe7 100644 --- a/gtestsuite/testsuite/level3/gemm/zgemm_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/gemm/zgemm_evt_testing.cpp @@ -170,9 +170,9 @@ public: #endif str_name = str_name + "C_matrix_storage_" + sfm; str_name = str_name + "_transA_" + tsa + "_transB_" + tsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name = str_name + "_A" + std::to_string(ai) + std::to_string(aj); str_name = str_name + "_" + testinghelpers::get_value_string(aex); str_name = str_name + "_B" + std::to_string(bi) + std::to_string(bj); diff --git a/gtestsuite/testsuite/level3/gemm/zgemm_generic.cpp b/gtestsuite/testsuite/level3/gemm/zgemm_generic.cpp index 092a2a62f..e63668ce5 100644 --- a/gtestsuite/testsuite/level3/gemm/zgemm_generic.cpp +++ b/gtestsuite/testsuite/level3/gemm/zgemm_generic.cpp @@ -123,9 +123,9 @@ public: #endif str_name = str_name + "storageC_" + sfm; str_name = str_name + "_transA_" + tsa + "_transB_" + tsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); gtint_t lda = testinghelpers::get_leading_dimension( sfm, tsa, m, k, lda_inc ); diff --git a/gtestsuite/testsuite/level3/gemm_compute/dgemm_compute_generic.cpp b/gtestsuite/testsuite/level3/gemm_compute/dgemm_compute_generic.cpp index 200ebd106..ef5df698d 100644 --- a/gtestsuite/testsuite/level3/gemm_compute/dgemm_compute_generic.cpp +++ b/gtestsuite/testsuite/level3/gemm_compute/dgemm_compute_generic.cpp @@ -132,9 +132,9 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + tsa + tsb; str_name = str_name + "_" + pka + pkb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/gemm_compute/sgemm_compute_generic.cpp b/gtestsuite/testsuite/level3/gemm_compute/sgemm_compute_generic.cpp index b1b08b6de..7e9604ecd 100644 --- a/gtestsuite/testsuite/level3/gemm_compute/sgemm_compute_generic.cpp +++ b/gtestsuite/testsuite/level3/gemm_compute/sgemm_compute_generic.cpp @@ -133,9 +133,9 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + tsa + tsb; str_name = str_name + "_" + pka + pkb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/gemmt/cgemmt_generic.cpp b/gtestsuite/testsuite/level3/gemmt/cgemmt_generic.cpp index ea79772ea..7c97c804f 100644 --- a/gtestsuite/testsuite/level3/gemmt/cgemmt_generic.cpp +++ b/gtestsuite/testsuite/level3/gemmt/cgemmt_generic.cpp @@ -125,8 +125,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/gemmt/dgemmt_evt_testing.cpp b/gtestsuite/testsuite/level3/gemmt/dgemmt_evt_testing.cpp index cfbecc336..4056b2d74 100644 --- a/gtestsuite/testsuite/level3/gemmt/dgemmt_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/gemmt/dgemmt_evt_testing.cpp @@ -134,8 +134,8 @@ public: str_name = str_name + "_transa_" + tsa; str_name = str_name + "_transb_" + tsb; str_name = str_name + "_uploa_" + uplo; - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); gtint_t lda = testinghelpers::get_leading_dimension( sfm, tsa, n, k, lda_inc ); diff --git a/gtestsuite/testsuite/level3/gemmt/dgemmt_generic.cpp b/gtestsuite/testsuite/level3/gemmt/dgemmt_generic.cpp index 7aa1520b6..2ec67c2e8 100644 --- a/gtestsuite/testsuite/level3/gemmt/dgemmt_generic.cpp +++ b/gtestsuite/testsuite/level3/gemmt/dgemmt_generic.cpp @@ -128,8 +128,8 @@ public: str_name = str_name + "_transa_" + tsa; str_name = str_name + "_transb_" + tsb; str_name = str_name + "_uploa_" + uplo; - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); gtint_t lda = testinghelpers::get_leading_dimension( sfm, tsa, n, k, lda_inc ); diff --git a/gtestsuite/testsuite/level3/gemmt/sgemmt_generic.cpp b/gtestsuite/testsuite/level3/gemmt/sgemmt_generic.cpp index b16f9126a..f205b135f 100644 --- a/gtestsuite/testsuite/level3/gemmt/sgemmt_generic.cpp +++ b/gtestsuite/testsuite/level3/gemmt/sgemmt_generic.cpp @@ -124,8 +124,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + tsa + tsb; str_name = str_name + "_" + uplo; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/gemmt/zgemmt_generic.cpp b/gtestsuite/testsuite/level3/gemmt/zgemmt_generic.cpp index 62544bb3f..d5a6ba62c 100644 --- a/gtestsuite/testsuite/level3/gemmt/zgemmt_generic.cpp +++ b/gtestsuite/testsuite/level3/gemmt/zgemmt_generic.cpp @@ -125,8 +125,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/hemm/chemm_generic.cpp b/gtestsuite/testsuite/level3/hemm/chemm_generic.cpp index d7eeae50a..eb15a15ea 100644 --- a/gtestsuite/testsuite/level3/hemm/chemm_generic.cpp +++ b/gtestsuite/testsuite/level3/hemm/chemm_generic.cpp @@ -131,8 +131,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uplo; str_name = str_name + "_" + conja + tsb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/hemm/zhemm_generic.cpp b/gtestsuite/testsuite/level3/hemm/zhemm_generic.cpp index 9f70833f9..5bd88182c 100644 --- a/gtestsuite/testsuite/level3/hemm/zhemm_generic.cpp +++ b/gtestsuite/testsuite/level3/hemm/zhemm_generic.cpp @@ -131,8 +131,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uplo; str_name = str_name + "_" + conja + tsb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/her2k/cher2k_generic.cpp b/gtestsuite/testsuite/level3/her2k/cher2k_generic.cpp index 7e2bb5c27..b5af4aa9e 100644 --- a/gtestsuite/testsuite/level3/her2k/cher2k_generic.cpp +++ b/gtestsuite/testsuite/level3/her2k/cher2k_generic.cpp @@ -123,8 +123,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/her2k/zher2k_generic.cpp b/gtestsuite/testsuite/level3/her2k/zher2k_generic.cpp index c712df8f8..3b661c868 100644 --- a/gtestsuite/testsuite/level3/her2k/zher2k_generic.cpp +++ b/gtestsuite/testsuite/level3/her2k/zher2k_generic.cpp @@ -123,8 +123,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/herk/cherk_generic.cpp b/gtestsuite/testsuite/level3/herk/cherk_generic.cpp index a3866e773..0718d8168 100644 --- a/gtestsuite/testsuite/level3/herk/cherk_generic.cpp +++ b/gtestsuite/testsuite/level3/herk/cherk_generic.cpp @@ -116,8 +116,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/herk/zherk_generic.cpp b/gtestsuite/testsuite/level3/herk/zherk_generic.cpp index 0a0cb97e4..88a822b2b 100644 --- a/gtestsuite/testsuite/level3/herk/zherk_generic.cpp +++ b/gtestsuite/testsuite/level3/herk/zherk_generic.cpp @@ -116,8 +116,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/symm/csymm_generic.cpp b/gtestsuite/testsuite/level3/symm/csymm_generic.cpp index fd06ee220..d42ed8828 100644 --- a/gtestsuite/testsuite/level3/symm/csymm_generic.cpp +++ b/gtestsuite/testsuite/level3/symm/csymm_generic.cpp @@ -131,8 +131,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uplo; str_name = str_name + "_" + conja + tsb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/symm/dsymm_generic.cpp b/gtestsuite/testsuite/level3/symm/dsymm_generic.cpp index c34394d94..720dcdbaa 100644 --- a/gtestsuite/testsuite/level3/symm/dsymm_generic.cpp +++ b/gtestsuite/testsuite/level3/symm/dsymm_generic.cpp @@ -130,8 +130,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uplo; str_name = str_name + "_" + conja + tsb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/symm/ssymm_generic.cpp b/gtestsuite/testsuite/level3/symm/ssymm_generic.cpp index 56a7c3487..03d184430 100644 --- a/gtestsuite/testsuite/level3/symm/ssymm_generic.cpp +++ b/gtestsuite/testsuite/level3/symm/ssymm_generic.cpp @@ -130,8 +130,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uplo; str_name = str_name + "_" + conja + tsb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/symm/zsymm_generic.cpp b/gtestsuite/testsuite/level3/symm/zsymm_generic.cpp index 79c2a9f8e..e000a779d 100644 --- a/gtestsuite/testsuite/level3/symm/zsymm_generic.cpp +++ b/gtestsuite/testsuite/level3/symm/zsymm_generic.cpp @@ -131,8 +131,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uplo; str_name = str_name + "_" + conja + tsb; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/syr2k/csyr2k_generic.cpp b/gtestsuite/testsuite/level3/syr2k/csyr2k_generic.cpp index 232681a76..d625e6ee0 100644 --- a/gtestsuite/testsuite/level3/syr2k/csyr2k_generic.cpp +++ b/gtestsuite/testsuite/level3/syr2k/csyr2k_generic.cpp @@ -123,8 +123,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/syr2k/dsyr2k_generic.cpp b/gtestsuite/testsuite/level3/syr2k/dsyr2k_generic.cpp index fd4db6f50..adb729d8b 100644 --- a/gtestsuite/testsuite/level3/syr2k/dsyr2k_generic.cpp +++ b/gtestsuite/testsuite/level3/syr2k/dsyr2k_generic.cpp @@ -122,8 +122,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/syr2k/ssyr2k_generic.cpp b/gtestsuite/testsuite/level3/syr2k/ssyr2k_generic.cpp index 573477def..e7fa02fb5 100644 --- a/gtestsuite/testsuite/level3/syr2k/ssyr2k_generic.cpp +++ b/gtestsuite/testsuite/level3/syr2k/ssyr2k_generic.cpp @@ -122,8 +122,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/syr2k/zsyr2k_generic.cpp b/gtestsuite/testsuite/level3/syr2k/zsyr2k_generic.cpp index b421b7096..12cd5d1d6 100644 --- a/gtestsuite/testsuite/level3/syr2k/zsyr2k_generic.cpp +++ b/gtestsuite/testsuite/level3/syr2k/zsyr2k_generic.cpp @@ -123,8 +123,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa + tsb; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/syrk/csyrk_generic.cpp b/gtestsuite/testsuite/level3/syrk/csyrk_generic.cpp index 5367c3c20..c2ae4564b 100644 --- a/gtestsuite/testsuite/level3/syrk/csyrk_generic.cpp +++ b/gtestsuite/testsuite/level3/syrk/csyrk_generic.cpp @@ -116,8 +116,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/syrk/dsyrk_generic.cpp b/gtestsuite/testsuite/level3/syrk/dsyrk_generic.cpp index de6bf8d68..1c49e9ce5 100644 --- a/gtestsuite/testsuite/level3/syrk/dsyrk_generic.cpp +++ b/gtestsuite/testsuite/level3/syrk/dsyrk_generic.cpp @@ -115,8 +115,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/syrk/ssyrk_generic.cpp b/gtestsuite/testsuite/level3/syrk/ssyrk_generic.cpp index 85aa64967..fb659722b 100644 --- a/gtestsuite/testsuite/level3/syrk/ssyrk_generic.cpp +++ b/gtestsuite/testsuite/level3/syrk/ssyrk_generic.cpp @@ -115,8 +115,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/syrk/zsyrk_generic.cpp b/gtestsuite/testsuite/level3/syrk/zsyrk_generic.cpp index 3b409cdb5..3954b03c0 100644 --- a/gtestsuite/testsuite/level3/syrk/zsyrk_generic.cpp +++ b/gtestsuite/testsuite/level3/syrk/zsyrk_generic.cpp @@ -116,8 +116,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + uplo; str_name = str_name + "_" + tsa; - str_name = str_name + "_" + std::to_string(n); - str_name = str_name + "_" + std::to_string(k); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/trmm/ctrmm_generic.cpp b/gtestsuite/testsuite/level3/trmm/ctrmm_generic.cpp index 9d309c41f..61a4fad50 100644 --- a/gtestsuite/testsuite/level3/trmm/ctrmm_generic.cpp +++ b/gtestsuite/testsuite/level3/trmm/ctrmm_generic.cpp @@ -121,8 +121,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(lda_inc); str_name = str_name + "_" + std::to_string(ldb_inc); diff --git a/gtestsuite/testsuite/level3/trmm/dtrmm_generic.cpp b/gtestsuite/testsuite/level3/trmm/dtrmm_generic.cpp index 3a99bd93f..fefcc6da9 100644 --- a/gtestsuite/testsuite/level3/trmm/dtrmm_generic.cpp +++ b/gtestsuite/testsuite/level3/trmm/dtrmm_generic.cpp @@ -120,8 +120,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(lda_inc); str_name = str_name + "_" + std::to_string(ldb_inc); diff --git a/gtestsuite/testsuite/level3/trmm/strmm_generic.cpp b/gtestsuite/testsuite/level3/trmm/strmm_generic.cpp index 25c78560b..213e66aaf 100644 --- a/gtestsuite/testsuite/level3/trmm/strmm_generic.cpp +++ b/gtestsuite/testsuite/level3/trmm/strmm_generic.cpp @@ -120,8 +120,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(lda_inc); str_name = str_name + "_" + std::to_string(ldb_inc); diff --git a/gtestsuite/testsuite/level3/trmm/ztrmm_generic.cpp b/gtestsuite/testsuite/level3/trmm/ztrmm_generic.cpp index c9e8033bb..e7b7c89b8 100644 --- a/gtestsuite/testsuite/level3/trmm/ztrmm_generic.cpp +++ b/gtestsuite/testsuite/level3/trmm/ztrmm_generic.cpp @@ -121,8 +121,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(lda_inc); str_name = str_name + "_" + std::to_string(ldb_inc); diff --git a/gtestsuite/testsuite/level3/trmm3/ctrmm3_generic.cpp b/gtestsuite/testsuite/level3/trmm3/ctrmm3_generic.cpp index 5d18f1a5d..015413049 100644 --- a/gtestsuite/testsuite/level3/trmm3/ctrmm3_generic.cpp +++ b/gtestsuite/testsuite/level3/trmm3/ctrmm3_generic.cpp @@ -131,8 +131,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa + transb; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/trmm3/dtrmm3_generic.cpp b/gtestsuite/testsuite/level3/trmm3/dtrmm3_generic.cpp index 747ad5a5f..ae3698835 100644 --- a/gtestsuite/testsuite/level3/trmm3/dtrmm3_generic.cpp +++ b/gtestsuite/testsuite/level3/trmm3/dtrmm3_generic.cpp @@ -130,8 +130,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa + transb; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/trmm3/strmm3_generic.cpp b/gtestsuite/testsuite/level3/trmm3/strmm3_generic.cpp index beb19a516..214153633 100644 --- a/gtestsuite/testsuite/level3/trmm3/strmm3_generic.cpp +++ b/gtestsuite/testsuite/level3/trmm3/strmm3_generic.cpp @@ -130,8 +130,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa + transb; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/trmm3/ztrmm3_generic.cpp b/gtestsuite/testsuite/level3/trmm3/ztrmm3_generic.cpp index e938395ff..bf9a3fc10 100644 --- a/gtestsuite/testsuite/level3/trmm3/ztrmm3_generic.cpp +++ b/gtestsuite/testsuite/level3/trmm3/ztrmm3_generic.cpp @@ -131,8 +131,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa + transb; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + std::to_string(lda_inc); diff --git a/gtestsuite/testsuite/level3/trsm/ctrsm_evt_testing.cpp b/gtestsuite/testsuite/level3/trsm/ctrsm_evt_testing.cpp index 0579ec2f1..fecf7f0a4 100644 --- a/gtestsuite/testsuite/level3/trsm/ctrsm_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/trsm/ctrsm_evt_testing.cpp @@ -132,8 +132,8 @@ public: str_name = str_name + "_uploa_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diag_" + diaga; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t mn; testinghelpers::set_dim_with_side( side, m, n, &mn ); diff --git a/gtestsuite/testsuite/level3/trsm/ctrsm_generic.cpp b/gtestsuite/testsuite/level3/trsm/ctrsm_generic.cpp index ea58ed72e..d31440122 100644 --- a/gtestsuite/testsuite/level3/trsm/ctrsm_generic.cpp +++ b/gtestsuite/testsuite/level3/trsm/ctrsm_generic.cpp @@ -123,8 +123,8 @@ public: str_name = str_name + "_uploa_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diag_" + diaga; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t mn; testinghelpers::set_dim_with_side( side, m, n, &mn ); diff --git a/gtestsuite/testsuite/level3/trsm/dtrsm_evt_testing.cpp b/gtestsuite/testsuite/level3/trsm/dtrsm_evt_testing.cpp index 4635523be..993940c97 100644 --- a/gtestsuite/testsuite/level3/trsm/dtrsm_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/trsm/dtrsm_evt_testing.cpp @@ -129,8 +129,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(lda_inc); str_name = str_name + "_" + std::to_string(ldb_inc); diff --git a/gtestsuite/testsuite/level3/trsm/dtrsm_generic.cpp b/gtestsuite/testsuite/level3/trsm/dtrsm_generic.cpp index a2cf474ac..0e0b0e520 100644 --- a/gtestsuite/testsuite/level3/trsm/dtrsm_generic.cpp +++ b/gtestsuite/testsuite/level3/trsm/dtrsm_generic.cpp @@ -120,8 +120,8 @@ public: str_name = str_name + "_" + sfm+sfm+sfm; str_name = str_name + "_" + side + uploa + transa; str_name = str_name + "_d" + diaga; - str_name = str_name + "_" + std::to_string(m); - str_name = str_name + "_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name = str_name + "_" + std::to_string(lda_inc); str_name = str_name + "_" + std::to_string(ldb_inc); diff --git a/gtestsuite/testsuite/level3/trsm/strsm_evt_testing.cpp b/gtestsuite/testsuite/level3/trsm/strsm_evt_testing.cpp index 31a7a4526..0456afc1b 100644 --- a/gtestsuite/testsuite/level3/trsm/strsm_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/trsm/strsm_evt_testing.cpp @@ -131,8 +131,8 @@ public: str_name = str_name + "_uploa_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diag_" + diaga; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t mn; testinghelpers::set_dim_with_side( side, m, n, &mn ); diff --git a/gtestsuite/testsuite/level3/trsm/strsm_generic.cpp b/gtestsuite/testsuite/level3/trsm/strsm_generic.cpp index 51103015f..f6088ebf0 100644 --- a/gtestsuite/testsuite/level3/trsm/strsm_generic.cpp +++ b/gtestsuite/testsuite/level3/trsm/strsm_generic.cpp @@ -122,8 +122,8 @@ public: str_name = str_name + "_uploa_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diag_" + diaga; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t mn; testinghelpers::set_dim_with_side( side, m, n, &mn ); diff --git a/gtestsuite/testsuite/level3/trsm/ztrsm_evt_testing.cpp b/gtestsuite/testsuite/level3/trsm/ztrsm_evt_testing.cpp index 1d5596821..ee26e0b2b 100644 --- a/gtestsuite/testsuite/level3/trsm/ztrsm_evt_testing.cpp +++ b/gtestsuite/testsuite/level3/trsm/ztrsm_evt_testing.cpp @@ -132,8 +132,8 @@ public: str_name = str_name + "_uploa_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diag_" + diaga; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t mn; testinghelpers::set_dim_with_side( side, m, n, &mn ); diff --git a/gtestsuite/testsuite/level3/trsm/ztrsm_generic.cpp b/gtestsuite/testsuite/level3/trsm/ztrsm_generic.cpp index 628add089..51adf4126 100644 --- a/gtestsuite/testsuite/level3/trsm/ztrsm_generic.cpp +++ b/gtestsuite/testsuite/level3/trsm/ztrsm_generic.cpp @@ -123,8 +123,8 @@ public: str_name = str_name + "_uploa_" + uploa; str_name = str_name + "_transa_" + transa; str_name = str_name + "_diag_" + diaga; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); gtint_t mn; testinghelpers::set_dim_with_side( side, m, n, &mn ); diff --git a/gtestsuite/testsuite/ukr/amaxv/damaxv_ukr.cpp b/gtestsuite/testsuite/ukr/amaxv/damaxv_ukr.cpp index ad7fc2e6e..6d950e470 100644 --- a/gtestsuite/testsuite/ukr/amaxv/damaxv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/amaxv/damaxv_ukr.cpp @@ -82,7 +82,7 @@ public: gtint_t incx = std::get<2>(str.param); bool is_memory_test = std::get<3>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += ( is_memory_test ) ? "_mem_test_enabled" : "_mem_test_disabled"; return str_name; diff --git a/gtestsuite/testsuite/ukr/amaxv/samaxv_ukr.cpp b/gtestsuite/testsuite/ukr/amaxv/samaxv_ukr.cpp index ed16859ae..54ba75428 100644 --- a/gtestsuite/testsuite/ukr/amaxv/samaxv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/amaxv/samaxv_ukr.cpp @@ -82,7 +82,7 @@ public: gtint_t incx = std::get<2>(str.param); bool is_memory_test = std::get<3>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += ( is_memory_test ) ? "_mem_test_enabled" : "_mem_test_disabled"; return str_name; diff --git a/gtestsuite/testsuite/ukr/axpbyv/daxpbyv_ukr.cpp b/gtestsuite/testsuite/ukr/axpbyv/daxpbyv_ukr.cpp index 55713a065..a315c32b0 100644 --- a/gtestsuite/testsuite/ukr/axpbyv/daxpbyv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/axpbyv/daxpbyv_ukr.cpp @@ -126,7 +126,7 @@ public: bool is_memory_test = std::get<7>(str.param); std::string str_name = "daxpbyv_ukr"; - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/ukr/axpbyv/saxpbyv_ukr.cpp b/gtestsuite/testsuite/ukr/axpbyv/saxpbyv_ukr.cpp index d1e5d25a9..122983436 100644 --- a/gtestsuite/testsuite/ukr/axpbyv/saxpbyv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/axpbyv/saxpbyv_ukr.cpp @@ -122,7 +122,7 @@ public: float beta = std::get<6>(str.param); std::string str_name = "saxpbyv_ukr"; - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/ukr/axpbyv/zaxpbyv_ukr.cpp b/gtestsuite/testsuite/ukr/axpbyv/zaxpbyv_ukr.cpp index a562a866d..6ec2df912 100644 --- a/gtestsuite/testsuite/ukr/axpbyv/zaxpbyv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/axpbyv/zaxpbyv_ukr.cpp @@ -126,7 +126,7 @@ public: dcomplex beta = std::get<6>(str.param); bool is_memory_test = std::get<7>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconj_x" : "_conj_x"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/ukr/axpyv/daxpyv_ukr.cpp b/gtestsuite/testsuite/ukr/axpyv/daxpyv_ukr.cpp index a2403ab87..ece533aff 100644 --- a/gtestsuite/testsuite/ukr/axpyv/daxpyv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/axpyv/daxpyv_ukr.cpp @@ -104,7 +104,7 @@ public: bool is_memory_test = std::get<6>(str.param); std::string str_name = "daxpyv_ukr"; - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/ukr/axpyv/saxpyv_ukr.cpp b/gtestsuite/testsuite/ukr/axpyv/saxpyv_ukr.cpp index fc8f7796e..4bbab475f 100644 --- a/gtestsuite/testsuite/ukr/axpyv/saxpyv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/axpyv/saxpyv_ukr.cpp @@ -95,7 +95,7 @@ public: float alpha = std::get<5>(str.param); bool is_memory_test = std::get<6>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconj_x" : "_conj_x"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/ukr/axpyv/zaxpyv_ukr.cpp b/gtestsuite/testsuite/ukr/axpyv/zaxpyv_ukr.cpp index 77bc477eb..80b8d80d5 100644 --- a/gtestsuite/testsuite/ukr/axpyv/zaxpyv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/axpyv/zaxpyv_ukr.cpp @@ -105,7 +105,7 @@ public: dcomplex alpha = std::get<5>(str.param); bool is_memory_test = std::get<6>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += ( conjx == 'n' )? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/ukr/copyv/dcopyv_ukr.cpp b/gtestsuite/testsuite/ukr/copyv/dcopyv_ukr.cpp index ba4d1a90b..2e2f62840 100644 --- a/gtestsuite/testsuite/ukr/copyv/dcopyv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/copyv/dcopyv_ukr.cpp @@ -86,7 +86,7 @@ public: bool is_memory_test = std::get<5>(str.param); std::string str_name = "dcopyv_ukr"; - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_conjx" + std::string(&conjx, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_incy_" + testinghelpers::get_value_string(incy); diff --git a/gtestsuite/testsuite/ukr/dotv/ddotv_ukr.cpp b/gtestsuite/testsuite/ukr/dotv/ddotv_ukr.cpp index 3df9e45f4..e5c372416 100644 --- a/gtestsuite/testsuite/ukr/dotv/ddotv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/dotv/ddotv_ukr.cpp @@ -101,7 +101,7 @@ public: bool is_memory_test = std::get<6>(str.param); std::string str_name = "ddotvUkr_"; - str_name += "n_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "conjx_" + std::string(&conjx, 1); str_name += "conjy_" + std::string(&conjy, 1); str_name += "_incx_" + testinghelpers::get_value_string(incx); diff --git a/gtestsuite/testsuite/ukr/gemm/cgemm_ukernel.cpp b/gtestsuite/testsuite/ukr/gemm/cgemm_ukernel.cpp index 4cd4bd943..11f41358d 100644 --- a/gtestsuite/testsuite/ukr/gemm/cgemm_ukernel.cpp +++ b/gtestsuite/testsuite/ukr/gemm/cgemm_ukernel.cpp @@ -88,9 +88,9 @@ public: str_name = str_name + "StorageOfMatrix_" + storage; str_name = str_name + "_transA_" + trnsa; str_name = str_name + "_transB_" + trnsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + (is_memory_test ? "_mem_test_enabled" : "_mem_test_disabled"); @@ -659,7 +659,7 @@ public: std::string str_name ; str_name = str_name + "StorageOfCMatrix_" + storage; - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + (is_memory_test ? "_mem_test_enabled" : "_mem_test_disabled"); diff --git a/gtestsuite/testsuite/ukr/gemm/dgemm_ukernel.cpp b/gtestsuite/testsuite/ukr/gemm/dgemm_ukernel.cpp index 4d89756b0..86e92014b 100644 --- a/gtestsuite/testsuite/ukr/gemm/dgemm_ukernel.cpp +++ b/gtestsuite/testsuite/ukr/gemm/dgemm_ukernel.cpp @@ -82,9 +82,9 @@ public: std::string str_name; str_name = str_name + "_" + trnsa; str_name = str_name + "_" + trnsb; - str_name = str_name + "_m" + std::to_string(m); - str_name = str_name + "_n" + std::to_string(n); - str_name = str_name + "_k" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + storageC; @@ -295,7 +295,7 @@ public: bool memory_test = std::get<7>(str.param); std::string str_name; - str_name = str_name + "_k" + std::to_string(k); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha);; str_name += "_beta_" + testinghelpers::get_value_string(beta);; str_name = str_name + "_storage_" + storage; @@ -411,11 +411,11 @@ public: bool memory_test = std::get<6>(str.param); std::string str_name; - str_name = str_name + "_" + std::to_string(k); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); - str_name = str_name + "_m" + std::to_string(m); - str_name = str_name + "_n" + std::to_string(n); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); str_name = str_name + "_" + storage; str_name += ( memory_test ) ? "_mem_test_enabled" : "_mem_test_disabled"; @@ -661,9 +661,9 @@ public: bool memory_test = std::get<6>(str.param); std::string str_name; - str_name = str_name + "_m" + std::to_string(m); - str_name = str_name + "_n" + std::to_string(n); - str_name = str_name + "_k" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_" + storage; diff --git a/gtestsuite/testsuite/ukr/gemm/sgemm_ukernel.cpp b/gtestsuite/testsuite/ukr/gemm/sgemm_ukernel.cpp index 7435d9240..93dec669b 100644 --- a/gtestsuite/testsuite/ukr/gemm/sgemm_ukernel.cpp +++ b/gtestsuite/testsuite/ukr/gemm/sgemm_ukernel.cpp @@ -81,9 +81,9 @@ public: std::string str_name; str_name = str_name + "_transa" + trnsa; str_name = str_name + "_transb" + trnsb; - str_name = str_name + "_m" + std::to_string(m); - str_name = str_name + "_n" + std::to_string(n); - str_name = str_name + "_k" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_storage" + storageC; @@ -354,7 +354,7 @@ public: char storage = std::get<4>(str.param); bool memory_test = std::get<7>(str.param); std::string str_name; - str_name = str_name + "_k" + std::to_string(k); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_storage" + storage; @@ -501,9 +501,9 @@ public: float beta = std::get<4>(str.param); char storage = std::get<5>(str.param); std::string str_name; - str_name = str_name + "_m" + std::to_string(m); - str_name = str_name + "_n" + std::to_string(n); - str_name = str_name + "_k" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + "_storage" + storage; diff --git a/gtestsuite/testsuite/ukr/gemm/zgemm_ukernel.cpp b/gtestsuite/testsuite/ukr/gemm/zgemm_ukernel.cpp index 57c3cff9c..ad0feff48 100644 --- a/gtestsuite/testsuite/ukr/gemm/zgemm_ukernel.cpp +++ b/gtestsuite/testsuite/ukr/gemm/zgemm_ukernel.cpp @@ -98,9 +98,9 @@ public: str_name = str_name + "StorageOfCMatrix_" + storageC; str_name = str_name + "_transA_" + trnsa; str_name = str_name + "_transB_" + trnsb; - str_name = str_name + "_m_" + std::to_string(m); - str_name = str_name + "_n_" + std::to_string(n); - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_m_" + std::to_string(m); + str_name += "_n_" + std::to_string(n); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + (is_memory_test ? "_mem_test_enabled" : "_mem_test_disabled"); @@ -1035,7 +1035,7 @@ public: std::string str_name ; str_name = str_name + "StorageOfCMatrix_" + storage; - str_name = str_name + "_k_" + std::to_string(k); + str_name += "_k_" + std::to_string(k); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); str_name += "_beta_" + testinghelpers::get_value_string(beta); str_name = str_name + (is_memory_test ? "_mem_test_enabled" : "_mem_test_disabled"); diff --git a/gtestsuite/testsuite/ukr/nrm2/dnrm2_ukr.cpp b/gtestsuite/testsuite/ukr/nrm2/dnrm2_ukr.cpp index 84110f279..25adbb6dc 100644 --- a/gtestsuite/testsuite/ukr/nrm2/dnrm2_ukr.cpp +++ b/gtestsuite/testsuite/ukr/nrm2/dnrm2_ukr.cpp @@ -78,7 +78,7 @@ public: gtint_t incx = std::get<2>(str.param); bool is_memory_test = std::get<3>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += ( is_memory_test ) ? "_mem_test_enabled" : "_mem_test_disabled"; return str_name; diff --git a/gtestsuite/testsuite/ukr/nrm2/dznrm2_ukr.cpp b/gtestsuite/testsuite/ukr/nrm2/dznrm2_ukr.cpp index 8ba5a8c1f..f702834c9 100644 --- a/gtestsuite/testsuite/ukr/nrm2/dznrm2_ukr.cpp +++ b/gtestsuite/testsuite/ukr/nrm2/dznrm2_ukr.cpp @@ -78,7 +78,7 @@ public: gtint_t incx = std::get<2>(str.param); bool is_memory_test = std::get<3>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += ( is_memory_test ) ? "_mem_test_enabled" : "_mem_test_disabled"; return str_name; diff --git a/gtestsuite/testsuite/ukr/nrm2/scnrm2_ukr.cpp b/gtestsuite/testsuite/ukr/nrm2/scnrm2_ukr.cpp index 15a7c9817..2eac06800 100644 --- a/gtestsuite/testsuite/ukr/nrm2/scnrm2_ukr.cpp +++ b/gtestsuite/testsuite/ukr/nrm2/scnrm2_ukr.cpp @@ -78,7 +78,7 @@ public: gtint_t incx = std::get<2>(str.param); bool is_memory_test = std::get<3>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += ( is_memory_test ) ? "_mem_test_enabled" : "_mem_test_disabled"; return str_name; diff --git a/gtestsuite/testsuite/ukr/nrm2/snrm2_ukr.cpp b/gtestsuite/testsuite/ukr/nrm2/snrm2_ukr.cpp index 8651aaa06..52c41e1c2 100644 --- a/gtestsuite/testsuite/ukr/nrm2/snrm2_ukr.cpp +++ b/gtestsuite/testsuite/ukr/nrm2/snrm2_ukr.cpp @@ -78,7 +78,7 @@ public: gtint_t incx = std::get<2>(str.param); bool is_memory_test = std::get<3>(str.param); - std::string str_name = "n" + std::to_string(n); + std::string str_name = "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += ( is_memory_test ) ? "_mem_test_enabled" : "_mem_test_disabled"; return str_name; diff --git a/gtestsuite/testsuite/ukr/scalv/dscalv_ukr.cpp b/gtestsuite/testsuite/ukr/scalv/dscalv_ukr.cpp index a8e9bf54c..5b58aeae5 100644 --- a/gtestsuite/testsuite/ukr/scalv/dscalv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/scalv/dscalv_ukr.cpp @@ -95,7 +95,7 @@ public: bool is_memory_test = std::get<5>(str.param); std::string str_name = "d"; - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conjx == 'n') ? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/ukr/scalv/zdscalv_ukr.cpp b/gtestsuite/testsuite/ukr/scalv/zdscalv_ukr.cpp index f01d87c27..9768f96ed 100644 --- a/gtestsuite/testsuite/ukr/scalv/zdscalv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/scalv/zdscalv_ukr.cpp @@ -102,7 +102,7 @@ public: bool is_memory_test = std::get<5>(str.param); std::string str_name = "zd"; - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conjx == 'n') ? "_noconjalpha" : "_conjalpha"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/ukr/scalv/zscalv_ukr.cpp b/gtestsuite/testsuite/ukr/scalv/zscalv_ukr.cpp index 528b73375..1a31ad19d 100644 --- a/gtestsuite/testsuite/ukr/scalv/zscalv_ukr.cpp +++ b/gtestsuite/testsuite/ukr/scalv/zscalv_ukr.cpp @@ -98,7 +98,7 @@ public: bool is_memory_test = std::get<5>(str.param); std::string str_name = "z"; - str_name += "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += (conjx == 'n') ? "_noconjx" : "_conjx"; str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name += "_alpha_" + testinghelpers::get_value_string(alpha); diff --git a/gtestsuite/testsuite/util/asumv/dasumv_evt_testing.cpp b/gtestsuite/testsuite/util/asumv/dasumv_evt_testing.cpp index 44b72ce73..d6c092a1e 100644 --- a/gtestsuite/testsuite/util/asumv/dasumv_evt_testing.cpp +++ b/gtestsuite/testsuite/util/asumv/dasumv_evt_testing.cpp @@ -97,7 +97,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_dasumv"; #endif - str_name = str_name + "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_X_" + std::to_string(xi); str_name = str_name + "_" + testinghelpers::get_value_string(ix_exval); diff --git a/gtestsuite/testsuite/util/asumv/dasumv_generic.cpp b/gtestsuite/testsuite/util/asumv/dasumv_generic.cpp index 4dfee3621..34a77dfb5 100644 --- a/gtestsuite/testsuite/util/asumv/dasumv_generic.cpp +++ b/gtestsuite/testsuite/util/asumv/dasumv_generic.cpp @@ -80,7 +80,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_dasumv"; #endif - str_name = str_name + "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/util/asumv/dzasumv_generic.cpp b/gtestsuite/testsuite/util/asumv/dzasumv_generic.cpp index 7c885a743..29240b409 100644 --- a/gtestsuite/testsuite/util/asumv/dzasumv_generic.cpp +++ b/gtestsuite/testsuite/util/asumv/dzasumv_generic.cpp @@ -81,7 +81,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_dzasumv"; #endif - str_name = str_name + "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/util/asumv/sasumv_generic.cpp b/gtestsuite/testsuite/util/asumv/sasumv_generic.cpp index 8ef04cc0c..d3a7fc252 100644 --- a/gtestsuite/testsuite/util/asumv/sasumv_generic.cpp +++ b/gtestsuite/testsuite/util/asumv/sasumv_generic.cpp @@ -80,7 +80,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_sasumv"; #endif - str_name = str_name + "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/util/asumv/scasumv_generic.cpp b/gtestsuite/testsuite/util/asumv/scasumv_generic.cpp index 9b69562a2..31f929bdb 100644 --- a/gtestsuite/testsuite/util/asumv/scasumv_generic.cpp +++ b/gtestsuite/testsuite/util/asumv/scasumv_generic.cpp @@ -81,7 +81,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_scasumv"; #endif - str_name = str_name + "_n" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/util/nrm2/dnrm2_extreme_values.cpp b/gtestsuite/testsuite/util/nrm2/dnrm2_extreme_values.cpp index c4bc05d42..4ba5be2ed 100644 --- a/gtestsuite/testsuite/util/nrm2/dnrm2_extreme_values.cpp +++ b/gtestsuite/testsuite/util/nrm2/dnrm2_extreme_values.cpp @@ -84,7 +84,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_dnormfv"; #endif - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_i" + std::to_string(i); std::string iexval_str = testinghelpers::get_value_string(iexval); diff --git a/gtestsuite/testsuite/util/nrm2/dnrm2_generic.cpp b/gtestsuite/testsuite/util/nrm2/dnrm2_generic.cpp index 8915f629a..7cd559ad5 100644 --- a/gtestsuite/testsuite/util/nrm2/dnrm2_generic.cpp +++ b/gtestsuite/testsuite/util/nrm2/dnrm2_generic.cpp @@ -80,7 +80,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_dnormfv"; #endif - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/util/nrm2/dznrm2_extreme_values.cpp b/gtestsuite/testsuite/util/nrm2/dznrm2_extreme_values.cpp index 83fc006a4..be70bb578 100644 --- a/gtestsuite/testsuite/util/nrm2/dznrm2_extreme_values.cpp +++ b/gtestsuite/testsuite/util/nrm2/dznrm2_extreme_values.cpp @@ -84,7 +84,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_znormfv"; #endif - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_i" + std::to_string(i); std::string iexval_str = "_Re_" + testinghelpers::get_value_string(iexval.real) + "_Im_" + testinghelpers::get_value_string(iexval.imag); diff --git a/gtestsuite/testsuite/util/nrm2/dznrm2_generic.cpp b/gtestsuite/testsuite/util/nrm2/dznrm2_generic.cpp index 1a6629a8d..ebfe1f284 100644 --- a/gtestsuite/testsuite/util/nrm2/dznrm2_generic.cpp +++ b/gtestsuite/testsuite/util/nrm2/dznrm2_generic.cpp @@ -81,7 +81,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_znormfv"; #endif - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/util/nrm2/scnrm2_extreme_values.cpp b/gtestsuite/testsuite/util/nrm2/scnrm2_extreme_values.cpp index 5f4a9801e..68ca5ed83 100644 --- a/gtestsuite/testsuite/util/nrm2/scnrm2_extreme_values.cpp +++ b/gtestsuite/testsuite/util/nrm2/scnrm2_extreme_values.cpp @@ -84,7 +84,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_cnormfv"; #endif - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_i" + std::to_string(i); std::string iexval_str = "_Re_" + testinghelpers::get_value_string(iexval.real) + "_Im_" + testinghelpers::get_value_string(iexval.imag); diff --git a/gtestsuite/testsuite/util/nrm2/scnrm2_generic.cpp b/gtestsuite/testsuite/util/nrm2/scnrm2_generic.cpp index e139bb1f0..022f6c799 100644 --- a/gtestsuite/testsuite/util/nrm2/scnrm2_generic.cpp +++ b/gtestsuite/testsuite/util/nrm2/scnrm2_generic.cpp @@ -81,7 +81,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_cnormfv"; #endif - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; } diff --git a/gtestsuite/testsuite/util/nrm2/snrm2_extreme_values.cpp b/gtestsuite/testsuite/util/nrm2/snrm2_extreme_values.cpp index b5f22a702..19206c3af 100644 --- a/gtestsuite/testsuite/util/nrm2/snrm2_extreme_values.cpp +++ b/gtestsuite/testsuite/util/nrm2/snrm2_extreme_values.cpp @@ -84,7 +84,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_snormfv"; #endif - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); str_name = str_name + "_i" + std::to_string(i); std::string iexval_str = testinghelpers::get_value_string(iexval); diff --git a/gtestsuite/testsuite/util/nrm2/snrm2_generic.cpp b/gtestsuite/testsuite/util/nrm2/snrm2_generic.cpp index eda7d1032..6f38976b2 100644 --- a/gtestsuite/testsuite/util/nrm2/snrm2_generic.cpp +++ b/gtestsuite/testsuite/util/nrm2/snrm2_generic.cpp @@ -80,7 +80,7 @@ public: #else //#elif TEST_BLIS_TYPED std::string str_name = "bli_snormfv"; #endif - str_name = str_name + "_" + std::to_string(n); + str_name += "_n_" + std::to_string(n); str_name += "_incx_" + testinghelpers::get_value_string(incx); return str_name; }