Refactor test and script logic to improve task handling

Updated functional tests and scripts to support dynamically filtering tasks by type. Refactored execution logic to reduce redundancy and improve maintainability. Adjusted macros and utility functions for better namespace resolution.

Author: allnes

modules/core/util/include/util.hpp

@@ -16,7 +16,7 @@ namespace ppc::util {
 std::string GetAbsolutePath(const std::string &relative_path);
 int GetPPCNumThreads();
 
-#if defined(__clang__) || defined(__GNUC__)
+#if (defined(__clang__) || defined(__GNUC__)) && !defined(_MSC_VER)
 template <typename T>
 consteval std::string_view GetNamespace() {
   constexpr std::string_view kFunc = __PRETTY_FUNCTION__;

scripts/run_tests.py

@@ -53,27 +53,27 @@ def __run_exec(command):
             raise Exception(f"Subprocess return {result.returncode}.")
 
     @staticmethod
-    def __get_gtest_settings(repeats_count):
+    def __get_gtest_settings(repeats_count, type_task):
         command = f"--gtest_repeat={repeats_count} "
         command += "--gtest_recreate_environments_when_repeating "
         command += "--gtest_color=0 "
+        command += "--gtest_shuffle "
+        command += f"--gtest_filter=\"*{type_task}*\" "
         return command
 
     def run_threads(self):
         if platform.system() == "Linux" and not os.environ.get("ASAN_RUN"):
-            self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'seq_func_tests'} {self.__get_gtest_settings(1)}")
-            self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'stl_func_tests'} {self.__get_gtest_settings(1)}")
+            for task_type in ["seq", "stl"]:
+                self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'ppc_func_tests'} {self.__get_gtest_settings(1, '_' + task_type + '_')}")
 
-        self.__run_exec(f"{self.work_dir / 'seq_func_tests'} {self.__get_gtest_settings(3)}")
-        self.__run_exec(f"{self.work_dir / 'stl_func_tests'} {self.__get_gtest_settings(3)}")
-        self.__run_exec(f"{self.work_dir / 'tbb_func_tests'} {self.__get_gtest_settings(3)}")
-        self.__run_exec(f"{self.work_dir / 'omp_func_tests'} {self.__get_gtest_settings(3)}")
+        for task_type in ["omp", "seq", "stl", "tbb"]:
+            self.__run_exec(f"{self.work_dir / 'ppc_func_tests'} {self.__get_gtest_settings(3, '_' + task_type + '_')}")
 
     def run_core(self):
         if platform.system() == "Linux" and not os.environ.get("ASAN_RUN"):
-            self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'core_func_tests'} {self.__get_gtest_settings(1)}")
+            self.__run_exec(f"{self.valgrind_cmd} {self.work_dir / 'core_func_tests'} {self.__get_gtest_settings(1, '*')}")
 
-        self.__run_exec(f"{self.work_dir / 'core_func_tests'} {self.__get_gtest_settings(1)}")
+        self.__run_exec(f"{self.work_dir / 'core_func_tests'} {self.__get_gtest_settings(1, '*')}")
 
     def run_processes(self, additional_mpi_args):
         proc_count = os.environ.get("PROC_COUNT")
@@ -82,26 +82,23 @@ def run_processes(self, additional_mpi_args):
 
         mpi_running = f"{self.mpi_exec} {additional_mpi_args} -np {proc_count}"
         if not os.environ.get("ASAN_RUN"):
-            self.__run_exec(f"{mpi_running} {self.work_dir / 'all_func_tests'} {self.__get_gtest_settings(10)}")
-            self.__run_exec(f"{mpi_running} {self.work_dir / 'mpi_func_tests'} {self.__get_gtest_settings(10)}")
+            for task_type in ["all", "mpi"]:
+                self.__run_exec(f"{mpi_running} {self.work_dir / 'ppc_func_tests'} {self.__get_gtest_settings(10, '_' + task_type)}")
 
     def run_performance(self):
         if not os.environ.get("ASAN_RUN"):
             proc_count = os.environ.get("PROC_COUNT")
             if proc_count is None:
                 raise EnvironmentError("Required environment variable 'PROC_COUNT' is not set.")
             mpi_running = f"{self.mpi_exec} -np {proc_count}"
-            self.__run_exec(f"{mpi_running} {self.work_dir / 'all_perf_tests'} {self.__get_gtest_settings(1)}")
-            self.__run_exec(f"{mpi_running} {self.work_dir / 'mpi_perf_tests'} {self.__get_gtest_settings(1)}")
+            for task_type in ["all", "mpi"]:
+                self.__run_exec(f"{mpi_running} {self.work_dir / 'ppc_perf_tests'} {self.__get_gtest_settings(1, '_' + task_type)}")
 
-        self.__run_exec(f"{self.work_dir / 'omp_perf_tests'} {self.__get_gtest_settings(1)}")
-        self.__run_exec(f"{self.work_dir / 'seq_perf_tests'} {self.__get_gtest_settings(1)}")
-        self.__run_exec(f"{self.work_dir / 'stl_perf_tests'} {self.__get_gtest_settings(1)}")
-        self.__run_exec(f"{self.work_dir / 'tbb_perf_tests'} {self.__get_gtest_settings(1)}")
+        for task_type in ["omp", "seq", "stl", "tbb"]:
+            self.__run_exec(f"{self.work_dir / 'ppc_perf_tests'} {self.__get_gtest_settings(1, '_' + task_type)}")
 
     def run_performance_list(self):
-        for task_type in ["all", "mpi", "omp", "seq", "stl", "tbb"]:
-            self.__run_exec(f"{self.work_dir / f'{task_type}_perf_tests'} --gtest_list_tests")
+            self.__run_exec(f"{self.work_dir / 'ppc_perf_tests'} --gtest_list_tests")
 
 
 if __name__ == "__main__":

tasks/example/tests/func_tests/main.cpp

@@ -22,7 +22,8 @@ class NesterovARunFuncTests : public ::testing::TestWithParam<ppc::util::FuncTes
  public:
   static std::string CustomFuncTestName(
       const ::testing::TestParamInfo<ppc::util::FuncTestParam<InType, OutType, int>>& info) {
-    return std::to_string(info.index);
+    return std::get<ppc::util::FuncTestParamIndex::kNameTest>(info.param) + "_" +
+        std::to_string(std::get<ppc::util::FuncTestParamIndex::kAddParams>(info.param));
   }
 
  protected:
@@ -60,8 +61,8 @@ class NesterovARunFuncTests : public ::testing::TestWithParam<ppc::util::FuncTes
 TEST_P(NesterovARunFuncTests, MatmulFromPic) { ExecuteTest(); }
 
 #define ADD_FUNC_TASK(TASK)                                    \
-  std::make_tuple(ppc::core::TaskGetter<TASK, InType>, "", 5), \
-      std::make_tuple(ppc::core::TaskGetter<TASK, InType>, "", 10)
+  std::make_tuple(ppc::core::TaskGetter<TASK, InType>, ppc::util::GetNamespace<TASK>(), 5), \
+      std::make_tuple(ppc::core::TaskGetter<TASK, InType>, ppc::util::GetNamespace<TASK>(), 10)
 
 INSTANTIATE_TEST_SUITE_P_NOLINT(PicMatrixTests, NesterovARunFuncTests,
                                 ::testing::Values(ADD_FUNC_TASK(nesterov_a_test_task_all::TestTaskALL),