From ef2428fb96c98de93ba5bbf9ce038fe106d664e2 Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Thu, 26 Oct 2023 22:04:53 +0000 Subject: [PATCH] Fixing V2 tests to accept HIP function versioning Change-Id: Ic68116feb51b396b27e858dcaf8b389d4d11a49b [ROCm/rocprofiler commit: cca295d951e6c4aaa5152f2152af07637cf2377c] --- .../tests-v2/featuretests/tracer/tracer_gtest.cpp | 10 ++++++++++ .../tests-v2/featuretests/utils/test_utils.cpp | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/projects/rocprofiler/tests-v2/featuretests/tracer/tracer_gtest.cpp b/projects/rocprofiler/tests-v2/featuretests/tracer/tracer_gtest.cpp index 3b80b00d97..cf5a1ca1ee 100644 --- a/projects/rocprofiler/tests-v2/featuretests/tracer/tracer_gtest.cpp +++ b/projects/rocprofiler/tests-v2/featuretests/tracer/tracer_gtest.cpp @@ -246,6 +246,16 @@ TEST_F(HelloWorldTest, WhenRunningTracerWithAppThenFunctionNamesMatchWithGoldenO ASSERT_TRUE(current_kernel_info.size()); + int version_position = current_kernel_info[0].function.find('R'); + if(version_position != std::string::npos) { + current_kernel_info[0].function = current_kernel_info[0].function.substr(0, version_position) + ')'; + } + + version_position = current_kernel_info[1].function.find('R'); + if(version_position != std::string::npos) { + current_kernel_info[1].function = current_kernel_info[1].function.substr(0, version_position) + ')'; + } + EXPECT_EQ(golden_kernel_info[0].function, current_kernel_info[0].function); EXPECT_EQ(golden_kernel_info[1].function, current_kernel_info[1].function); } diff --git a/projects/rocprofiler/tests-v2/featuretests/utils/test_utils.cpp b/projects/rocprofiler/tests-v2/featuretests/utils/test_utils.cpp index eda460a17c..8ce428e2e6 100644 --- a/projects/rocprofiler/tests-v2/featuretests/utils/test_utils.cpp +++ b/projects/rocprofiler/tests-v2/featuretests/utils/test_utils.cpp @@ -129,6 +129,10 @@ void tokenize_tracer_output(std::string line, tracer_kernel_info_t& kinfo) { std::getline(tokenStream, token, ','); kinfo.domain = token; std::getline(tokenStream, token, ','); + int version_position = token.find('R'); + if (version_position != std::string::npos) { + token = token.substr(0, version_position) + ')'; + } kinfo.function = token; std::getline(tokenStream, token, ','); kinfo.begin_time = token;