Add Report Generation Support (#201)

kartnema · web-flow · commit 486a20ec16bd · 2026-03-03T10:38:44.000+05:30
---
Signed-off-by: Kartik Nema &lt;kartnema@qti.qualcomm.com&gt;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -31,10 +31,10 @@ if(BUILD_TESTS)
 
     add_executable(
         RestuneComponentTests
-        ${CMAKE_CURRENT_SOURCE_DIR}/Component/MemoryPoolTests.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Component/ClientDataManagerTests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Component/ParserTests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Component/ExtensionIntfTests.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Component/MemoryPoolTests.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Component/ClientDataManagerTests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Component/MiscTests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Component/RequestQueueTests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Component/ThreadPoolTests.cpp
diff --git a/tests/Component/ClientDataManagerTests.cpp b/tests/Component/ClientDataManagerTests.cpp
@@ -10,6 +10,7 @@
 #include "ClientDataManager.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "CLIENT_DATA_MANAGER"
 
 static void Init() {
     static int8_t initDone = false;
diff --git a/tests/Component/CocoTableTests.cpp b/tests/Component/CocoTableTests.cpp
@@ -6,6 +6,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "COCO_TABLE"
 
 URM_TEST(TestCocoTableInsertRequest1, {
     E_ASSERT((CocoTable::getInstance()->insertRequest(nullptr) == false));
diff --git a/tests/Component/DeviceInfoTests.cpp b/tests/Component/DeviceInfoTests.cpp
@@ -10,14 +10,14 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "DEVICE_INFO_FETCH"
 
 static TestBaseline baseline;
 
 static void Init() {
     static int8_t initDone = false;
     if(!initDone) {
         initDone = true;
-        baseline.fetchBaseline();
         TargetRegistry::getInstance()->readTargetInfo();
     }
 }
diff --git a/tests/Component/ExtensionIntfTests.cpp b/tests/Component/ExtensionIntfTests.cpp
@@ -4,16 +4,10 @@
 #include "TestUtils.h"
 #include "ResourceRegistry.h"
 #include "RestuneParser.h"
-#include "Extensions.h"
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
-
-URM_REGISTER_CONFIG(RESOURCE_CONFIG, "/etc/urm/tests/configs/ResourcesConfig.yaml")
-URM_REGISTER_CONFIG(PROPERTIES_CONFIG, "/etc/urm/tests/configs/PropertiesConfig.yaml")
-URM_REGISTER_CONFIG(SIGNALS_CONFIG, "/etc/urm/tests/configs/SignalsConfig.yaml")
-URM_REGISTER_CONFIG(TARGET_CONFIG, "/etc/urm/tests/configs/TargetConfig.yaml")
-URM_REGISTER_CONFIG(INIT_CONFIG, "/etc/urm/tests/configs/InitConfig.yaml")
+#define TEST_SUBCAT "1_URM_EXTN_INTF"
 
 static int8_t funcCalled = false;
 static int32_t invokeCounter = 0;
@@ -33,17 +27,13 @@ static void customTear1(void* context) {
     funcCalled = true;
 }
 
-URM_REGISTER_RES_APPLIER_CB(0x00ff0000, customApplier1)
-URM_REGISTER_RES_TEAR_CB(0x00ff0001, customTear1)
-URM_REGISTER_RES_APPLIER_CB(0x00ff0002, customApplier2)
-
 static void Init() {
     static int8_t initDone = false;
     if(!initDone) {
         initDone = true;
-
-        RestuneParser configProcessor;
-        configProcessor.parseResourceConfigs(Extensions::getResourceConfigFilePath());
+        URM_REGISTER_RES_APPLIER_CB(0x00ff0000, customApplier1)
+        URM_REGISTER_RES_TEAR_CB(0x00ff0001, customTear1)
+        URM_REGISTER_RES_APPLIER_CB(0x00ff0002, customApplier2)
         ResourceRegistry::getInstance()->pluginModifications();
     }
 }
diff --git a/tests/Component/MemoryPoolTests.cpp b/tests/Component/MemoryPoolTests.cpp
@@ -6,6 +6,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "MEMORY_POOL"
 
 // Test structure, used for allocation testing
 struct TestBuffer {
diff --git a/tests/Component/MiscTests.cpp b/tests/Component/MiscTests.cpp
@@ -9,6 +9,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "MISC_CLASS_TESTS"
 
 // Request Cleanup Tests
 URM_TEST(TestResourceStructCoreClusterSettingAndExtraction, {
diff --git a/tests/Component/ParserTests.cpp b/tests/Component/ParserTests.cpp
@@ -13,6 +13,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "0_URM_PARSERS"
 
 URM_TEST(ResourceParsingTests, {
     {
diff --git a/tests/Component/RateLimiterTests.cpp b/tests/Component/RateLimiterTests.cpp
@@ -7,6 +7,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "RATE_LIMITER"
 
 static void Init() {
     static int8_t initDone = false;
diff --git a/tests/Component/RequestMapTests.cpp b/tests/Component/RequestMapTests.cpp
@@ -7,6 +7,8 @@
 #include "MemoryPool.h"
 #include "TestAggregator.h"
 
+#define TEST_SUBCAT "REQUEST_MAP"
+
 static void Init() {
     static int8_t initDone = false;
     if(!initDone) {
diff --git a/tests/Component/RequestQueueTests.cpp b/tests/Component/RequestQueueTests.cpp
@@ -6,6 +6,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "REQUEST_QUEUE"
 
 static void Init() {
     static int8_t initDone = false;
diff --git a/tests/Component/SafeOpsTests.cpp b/tests/Component/SafeOpsTests.cpp
@@ -9,6 +9,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "SAFE_OPS"
 
 // Test cases for Add function
 URM_TEST(Overflow1, {
diff --git a/tests/Component/ThreadPoolTests.cpp b/tests/Component/ThreadPoolTests.cpp
@@ -8,6 +8,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "THREAD_POOL"
 
 static std::mutex taskLock;
 static std::condition_variable taskCV;
diff --git a/tests/Component/TimerTests.cpp b/tests/Component/TimerTests.cpp
@@ -8,6 +8,7 @@
 #include "URMTests.h"
 
 #define TEST_CLASS "COMPONENT"
+#define TEST_SUBCAT "TIMER"
 
 static std::shared_ptr<ThreadPool> tpoolInstance = std::shared_ptr<ThreadPool> (new ThreadPool(4, 5));
 static std::atomic<int8_t> isFinished;
diff --git a/tests/Component/Trigger.cpp b/tests/Component/Trigger.cpp
@@ -2,7 +2,14 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
 #include "URMTests.h"
+#include "Extensions.h"
 
 #define TEST_CLASS "COMPONENT"
 
+URM_REGISTER_CONFIG(RESOURCE_CONFIG, "/etc/urm/tests/configs/ResourcesConfig.yaml")
+URM_REGISTER_CONFIG(PROPERTIES_CONFIG, "/etc/urm/tests/configs/PropertiesConfig.yaml")
+URM_REGISTER_CONFIG(SIGNALS_CONFIG, "/etc/urm/tests/configs/SignalsConfig.yaml")
+URM_REGISTER_CONFIG(TARGET_CONFIG, "/etc/urm/tests/configs/TargetConfig.yaml")
+URM_REGISTER_CONFIG(INIT_CONFIG, "/etc/urm/tests/configs/InitConfig.yaml")
+
 REGISTER_AND_TRIGGER_SUITE(TEST_CLASS)
diff --git a/tests/Configs/Baseline.yaml b/tests/Configs/Baseline.yaml
@@ -61,16 +61,3 @@ TestConfigs:
         PhyId: 2
     NumClusters: 3
     NumCores: 8
-
-  - TargetName: ["*"]
-    ClusterExpectations:
-      - LgcId: 0
-        PhyId: 4
-      - LgcId: 1
-        PhyId: 0
-      - LgcId: 2
-        PhyId: 9
-      - LgcId: 3
-        PhyId: 7
-    NumClusters: 4
-    NumCores: 10
diff --git a/tests/Integration/IntegrationTests.cpp b/tests/Integration/IntegrationTests.cpp
@@ -12,6 +12,7 @@
 #include "UrmAPIs.h"
 
 #define TEST_CLASS "INTEGRATION"
+#define TEST_SUBCAT "INTEGRATION"
 
 static TestBaseline baseline;
 
@@ -295,7 +296,7 @@ URM_TEST(TestInvalidResourceTuning, {
  * - Verify that the Resource Node's value remains unchanged.
  * Cross-Reference id: [F]
  */
-URM_TEST(OutOfBoundsResourceTuning, {
+URM_TEST(TestOutOfBoundsResourceTuning, {
     std::string testResourceName = "/etc/urm/tests/nodes/scaling_min_freq.txt";
     int32_t testResourceOriginalValue = 107;
 
@@ -431,7 +432,7 @@ URM_TEST(ResourceLogicalToPhysicalTranslationVerification3, {
     int32_t physicalClusterID = baseline.getExpectedPhysicalCluster(0);
     if(physicalClusterID == -1) {
         LOG_SKIP("Logical Cluster: 0 not found on test device, Skipping Test Case")
-        return;
+        SKIP
     }
 
     std::string testResourceName = "/etc/urm/tests/nodes/target_test_resource2.txt";
@@ -1966,7 +1967,7 @@ URM_TEST(TestPriorityBasedResourceAcquisition1, {
  * - Verify that the Sysfs Node is reset, once the Request Expires.
  * Cross-Reference id: ['H']
  */
-URM_TEST(PriorityBasedResourceAcquisition2, {
+URM_TEST(TestPriorityBasedResourceAcquisition2, {
     std::string testResourceName = "/etc/urm/tests/nodes/scaling_min_freq.txt";
     int32_t testResourceOriginalValue = 107;
     int64_t handle;
@@ -2238,7 +2239,7 @@ URM_TEST(TestRequestInvalidRetuning1, {
  *   should be rejected.
  * Cross-Reference id: ['R3']
  */
-URM_TEST(RequestInvalidRetuning2, {
+URM_TEST(TestRequestInvalidRetuning2, {
     std::string testResourceName = "/etc/urm/tests/nodes/sched_util_clamp_min.txt";
     int32_t testResourceOriginalValue = 300;
 
@@ -2295,7 +2296,7 @@ URM_TEST(TestClusterTypeResourceTuneRequest1, {
     int32_t physicalClusterID = baseline.getExpectedPhysicalCluster(0);
     if(physicalClusterID == -1) {
         LOG_SKIP("Logical Cluster: 0 not found on test device, Skipping Test Case")
-        return;
+        SKIP
     }
 
     std::string nodePath = "/etc/urm/tests/nodes/cluster_type_resource_%d_cluster_id.txt";
@@ -2340,11 +2341,11 @@ URM_TEST(TestClusterTypeResourceTuneRequest1, {
     delete[] resourceList;
 })
 
-URM_TEST(ClusterTypeResourceTuneRequest2, {
+URM_TEST(TestClusterTypeResourceTuneRequest2, {
     int32_t physicalClusterID = baseline.getExpectedPhysicalCluster(2);
     if(physicalClusterID == -1) {
         LOG_SKIP("Logical Cluster: 2 not found on test device, Skipping Test Case")
-        return;
+        SKIP
     }
 
     std::string nodePath = "/etc/urm/tests/nodes/cluster_type_resource_%d_cluster_id.txt";
@@ -2822,7 +2823,7 @@ URM_TEST(TestWriteTo_scaling_min_freq_Node1, {
 
     if(physicalClusterID == -1) {
         LOG_SKIP("Logical Cluster: 0 not found on test device, Skipping Test Case")
-        return;
+        SKIP
     }
 
     char path[128];
@@ -2887,7 +2888,7 @@ URM_TEST(TestWriteTo_scaling_min_freq_Node2, {
 
     if(physicalClusterID == -1) {
         LOG_SKIP("Logical Cluster: 1 not found on test device, Skipping Test Case")
-        return;
+        SKIP
     }
 
     char path[128];
@@ -2959,7 +2960,7 @@ URM_TEST(TestConcurrentWriteTo_scaling_min_freq_Node3, {
 
     if(physicalClusterID == -1) {
         LOG_SKIP("Logical Cluster: 1 not found on test device, Skipping Test Case")
-        return;
+        SKIP
     }
 
     char path[128];
@@ -3343,7 +3344,7 @@ URM_TEST(TestWriteTo_pm_qos_resume_latency_us1, {
 
     if(physicalClusterID == -1) {
         LOG_SKIP("Logical Cluster: 0 not found on test device, Skipping Test Case")
-        return;
+        SKIP
     }
 
     std::string nodePath = "/sys/devices/system/cpu/cpu%d/power/pm_qos_resume_latency_us";
@@ -3398,7 +3399,7 @@ URM_TEST(TestWriteTo_pm_qos_resume_latency_us2, {
     int32_t physicalClusterID = baseline.getExpectedPhysicalCluster(1);
     if(physicalClusterID == -1) {
         LOG_SKIP("Logical Cluster: 1 not found on test device, Skipping Test Case")
-        return;
+        SKIP
     }
 
     std::string nodePath = "/sys/devices/system/cpu/cpu%d/power/pm_qos_resume_latency_us";
diff --git a/tests/Utils/Baseline.cpp b/tests/Utils/Baseline.cpp
@@ -56,6 +56,11 @@ ClusterExpection* ClusterExpectationBuilder::build() {
     return this->mClusterExpectation;
 }
 
+TestBaseline::TestBaseline() {
+    this->mTotalClusterCount = this->mTotalCoreCount = -1;
+    this->parseTestConfigYamlNode(baselineYamlFilePath);
+}
+
 ErrCode TestBaseline::parseTestConfigYamlNode(const std::string& filePath) {
     SETUP_LIBYAML_PARSING(filePath);
 
@@ -189,10 +194,6 @@ ErrCode TestBaseline::parseTestConfigYamlNode(const std::string& filePath) {
     return RC_SUCCESS;
 }
 
-ErrCode TestBaseline::fetchBaseline() {
-    return parseTestConfigYamlNode(baselineYamlFilePath);
-}
-
 void TestBaseline::displayBaseline() {
     std::cout<<"Total Cluster Count: "<<this->getExpectedClusterCount()<<std::endl;
     std::cout<<"Total Core Count: "<<this->getExpectedCoreCount()<<std::endl;
diff --git a/tests/Utils/Include/TestBaseline.h b/tests/Utils/Include/TestBaseline.h
@@ -47,9 +47,8 @@ class TestBaseline {
     ErrCode parseTestConfigYamlNode(const std::string& filePath);
 
 public:
-    TestBaseline(): mTotalClusterCount(-1), mTotalCoreCount(-1) {}
+    TestBaseline();
 
-    ErrCode fetchBaseline();
     int32_t getExpectedClusterCount();
     int32_t getExpectedCoreCount();
     int32_t getExpectedPhysicalCluster(int32_t logicalID);
diff --git a/tests/Utils/Include/TestUtils.h b/tests/Utils/Include/TestUtils.h
@@ -49,14 +49,6 @@ static std::string getTimestamp() {
 #define LOG_BASE "["<<getTimestamp()<<"] "<<__func__<<":"<<__LINE__<<") "
 #define LOG_SKIP(message) std::cout<<"["<<getTimestamp()<<"] "<<__func__<<": Skipped, Reason: "<<message<<std::endl;
 
-#define RUN_TEST(test)                                                              \
-do {                                                                                \
-    std::cout<<"["<<getTimestamp()<<"] Running Test: "<<#test<<std::endl;           \
-    test();                                                                         \
-    std::cout<<"["<<getTimestamp()<<"] "<<#test<<": Run Successful"<<std::endl;     \
-    std::cout<<"--------------------------------------------------"<<std::endl;     \
-} while(false);                                                                     \
-
 #define C_STOI(value) ({                                                            \
     int32_t parsedValue = -1;                                                       \
     try {                                                                           \
diff --git a/tests/Utils/Include/URMTests.h b/tests/Utils/Include/URMTests.h
diff --git a/tests/Utils/URMTests.cpp b/tests/Utils/URMTests.cpp

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@`
`10`	`10`	`#include "URMTests.h"`
`11`	`11`
`12`	`12`	`#define TEST_CLASS "COMPONENT"`
	`13`	`+#define TEST_SUBCAT "DEVICE_INFO_FETCH"`
`13`	`14`
`14`	`15`	`static TestBaseline baseline;`
`15`	`16`
`16`	`17`	`static void Init() {`
`17`	`18`	`static int8_t initDone = false;`
`18`	`19`	`if(!initDone) {`
`19`	`20`	`initDone = true;`
`20`		`- baseline.fetchBaseline();`
`21`	`21`	`TargetRegistry::getInstance()->readTargetInfo();`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`#include "URMTests.h"`
`14`	`14`
`15`	`15`	`#define TEST_CLASS "COMPONENT"`
	`16`	`+#define TEST_SUBCAT "0_URM_PARSERS"`
`16`	`17`
`17`	`18`	`URM_TEST(ResourceParsingTests, {`
`18`	`19`	`{`