teflon: Rename model tests so they aren't skipped by gtest-runner

The regular expression engine in gtest-runner was matching more tests
than we wanted, so we weren't testing all we thought.

Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32485>

src/etnaviv/ci/etnaviv-vipnano-si-plus-skips.txt

@@ -3,27 +3,26 @@ Add.Op/input_size_8_weight_size_3_input_channels_32_output_channels_120_stride_1
 Add.Op/input_size_8_weight_size_5_input_channels_32_output_channels_256_stride_1_padding_same_1_is_signed_0
 
 # These tests below (adds) aren't well constructed and thus fail in TF
-MobileDetParam.Op/mobiledet8
-MobileDetParam.Op/mobiledet11
-MobileDetParam.Op/mobiledet14
-MobileDetParam.Op/mobiledet19
-MobileDetParam.Op/mobiledet22
-MobileDetParam.Op/mobiledet25
-MobileDetParam.Op/mobiledet32
-MobileDetParam.Op/mobiledet35
-MobileDetParam.Op/mobiledet38
-MobileDetParam.Op/mobiledet45
-MobileDetParam.Op/mobiledet49
-MobileDetParam.Op/mobiledet53
-MobileDetParam.Op/mobiledet60
-MobileDetParam.Op/mobiledet64
-MobileDetParam.Op/mobiledet68
-
-YoloXParam.Op/yolox11
-YoloXParam.Op/yolox20
-YoloXParam.Op/yolox23
-YoloXParam.Op/yolox26
-YoloXParam.Op/yolox35
-YoloXParam.Op/yolox38
-YoloXParam.Op/yolox41
+MobileDetParam.Op/mobiledet008
+MobileDetParam.Op/mobiledet011
+MobileDetParam.Op/mobiledet014
+MobileDetParam.Op/mobiledet019
+MobileDetParam.Op/mobiledet022
+MobileDetParam.Op/mobiledet025
+MobileDetParam.Op/mobiledet032
+MobileDetParam.Op/mobiledet035
+MobileDetParam.Op/mobiledet038
+MobileDetParam.Op/mobiledet045
+MobileDetParam.Op/mobiledet049
+MobileDetParam.Op/mobiledet053
+MobileDetParam.Op/mobiledet060
+MobileDetParam.Op/mobiledet064
+MobileDetParam.Op/mobiledet068
+YoloXParam.Op/yolox011
+YoloXParam.Op/yolox020
+YoloXParam.Op/yolox023
+YoloXParam.Op/yolox026
+YoloXParam.Op/yolox035
+YoloXParam.Op/yolox038
+YoloXParam.Op/yolox041
 

src/etnaviv/ci/etnaviv-vipnano-skips.txt

@@ -14,25 +14,25 @@ Add.Op/input_size_8_weight_size_5_input_channels_1_output_channels_256_stride_2_
 MobileDet.Whole
 
 # These tests below (adds) aren't well constructed and thus fail in TF
-MobileDetParam.Op/mobiledet8
-MobileDetParam.Op/mobiledet11
-MobileDetParam.Op/mobiledet14
-MobileDetParam.Op/mobiledet19
-MobileDetParam.Op/mobiledet22
-MobileDetParam.Op/mobiledet25
-MobileDetParam.Op/mobiledet32
-MobileDetParam.Op/mobiledet35
-MobileDetParam.Op/mobiledet38
-MobileDetParam.Op/mobiledet45
-MobileDetParam.Op/mobiledet49
-MobileDetParam.Op/mobiledet53
-MobileDetParam.Op/mobiledet60
-MobileDetParam.Op/mobiledet64
-MobileDetParam.Op/mobiledet68
-YoloXParam.Op/yolox11
-YoloXParam.Op/yolox20
-YoloXParam.Op/yolox23
-YoloXParam.Op/yolox26
-YoloXParam.Op/yolox35
-YoloXParam.Op/yolox38
-YoloXParam.Op/yolox41
+MobileDetParam.Op/mobiledet008
+MobileDetParam.Op/mobiledet011
+MobileDetParam.Op/mobiledet014
+MobileDetParam.Op/mobiledet019
+MobileDetParam.Op/mobiledet022
+MobileDetParam.Op/mobiledet025
+MobileDetParam.Op/mobiledet032
+MobileDetParam.Op/mobiledet035
+MobileDetParam.Op/mobiledet038
+MobileDetParam.Op/mobiledet045
+MobileDetParam.Op/mobiledet049
+MobileDetParam.Op/mobiledet053
+MobileDetParam.Op/mobiledet060
+MobileDetParam.Op/mobiledet064
+MobileDetParam.Op/mobiledet068
+YoloXParam.Op/yolox011
+YoloXParam.Op/yolox020
+YoloXParam.Op/yolox023
+YoloXParam.Op/yolox026
+YoloXParam.Op/yolox035
+YoloXParam.Op/yolox038
+YoloXParam.Op/yolox041

src/gallium/targets/teflon/test_teflon.cpp

@@ -407,7 +407,7 @@ TEST_P(MobileNetV1Param, Op)
 {
    std::ostringstream file_path;
    assert(getenv("TEFLON_TEST_DATA"));
-   file_path << getenv("TEFLON_TEST_DATA") << "/mb" << GetParam() << ".tflite";
+   file_path << getenv("TEFLON_TEST_DATA") << "/mb-" << std::setfill('0') << std::setw(3) << GetParam() << ".tflite";
 
    test_model_file(file_path.str(), MODEL_TOLERANCE);
 }
@@ -417,16 +417,18 @@ MobileNetV1TestCaseName(
    const testing::TestParamInfo<int> &info)
 {
    std::string name = "";
+   std::string param = std::to_string(info.param);
 
    name += "mb";
-   name += std::to_string(info.param);
+   name += std::string(3 - param.length(), '0');
+   name += param;
 
    return name;
 }
 
 INSTANTIATE_TEST_SUITE_P(
    , MobileNetV1Param,
-   ::testing::Range(0, 28),
+   ::testing::Range(0, 31),
    MobileNetV1TestCaseName);
 
 #endif
@@ -450,7 +452,7 @@ TEST_P(MobileDetParam, Op)
 {
    std::ostringstream file_path;
    assert(getenv("TEFLON_TEST_DATA"));
-   file_path << getenv("TEFLON_TEST_DATA") << "/mobiledet" << GetParam() << ".tflite";
+   file_path << getenv("TEFLON_TEST_DATA") << "/mobiledet-" << std::setfill('0') << std::setw(3) << GetParam() << ".tflite";
 
    test_model_file(file_path.str(), MODEL_TOLERANCE);
 }
@@ -460,16 +462,18 @@ MobileDetTestCaseName(
    const testing::TestParamInfo<int> &info)
 {
    std::string name = "";
+   std::string param = std::to_string(info.param);
 
    name += "mobiledet";
-   name += std::to_string(info.param);
+   name += std::string(3 - param.length(), '0');
+   name += param;
 
    return name;
 }
 
 INSTANTIATE_TEST_SUITE_P(
    , MobileDetParam,
-   ::testing::Range(0, 121),
+   ::testing::Range(0, 124),
    MobileDetTestCaseName);
 
 #endif
@@ -493,7 +497,7 @@ TEST_P(YoloXParam, Op)
 {
    std::ostringstream file_path;
    assert(getenv("TEFLON_TEST_DATA"));
-   file_path << getenv("TEFLON_TEST_DATA") << "/yolox-" << GetParam() << ".tflite";
+   file_path << getenv("TEFLON_TEST_DATA") << "/yolox-" << std::setfill('0') << std::setw(3) << GetParam() << ".tflite";
 
    test_model_file(file_path.str(), MODEL_TOLERANCE);
 }
@@ -503,9 +507,11 @@ YoloXTestCaseName(
    const testing::TestParamInfo<int> &info)
 {
    std::string name = "";
+   std::string param = std::to_string(info.param);
 
    name += "yolox";
-   name += std::to_string(info.param);
+   name += std::string(3 - param.length(), '0');
+   name += param;
 
    return name;
 }