From 9c9422827281d4098f7137158a9fc8396ebff791 Mon Sep 17 00:00:00 2001 From: JOAN VINYALS YLLA CATALA Date: Tue, 9 Jul 2024 12:43:59 +0200 Subject: [PATCH 1/4] Add generate the semantic maximum for Paraver cfgs Adds in the Paraver cfg generation of the Extrae::TypeStack backend the semantic maximum based on the number of regions that were created. --- src/backends/extrae/extrae_type_stack.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/backends/extrae/extrae_type_stack.cpp b/src/backends/extrae/extrae_type_stack.cpp index a5b5c49..a33b26e 100644 --- a/src/backends/extrae/extrae_type_stack.cpp +++ b/src/backends/extrae/extrae_type_stack.cpp @@ -52,6 +52,8 @@ window_intercomms_enabled true window_comm_fromto true window_comm_tagsize true window_comm_typeval true +window_y_maximum NESMIK_REPLACE_SEMANTIC_MAX +window_y_minimum 0 window_compute_y_max false window_level thread window_scale_relative 1.000000000000 @@ -91,6 +93,8 @@ window_intercomms_enabled true window_comm_fromto true window_comm_tagsize true window_comm_typeval true +window_y_maximum NESMIK_REPLACE_SEMANTIC_MAX +window_y_minimum 0 window_compute_y_max false window_level thread window_scale_relative 1.000000000000 @@ -227,9 +231,12 @@ void ExtraeTypeStackStrategy::Finalize() noexcept { auto replacedWindowHeightOverview = std::regex_replace( overviewReplacedNumLevels, std::regex("NESMIK_REPLACE_WINDOW_HEIGHT"), std::to_string(paraverConfigWindowHeight_)); - auto overviewReplacedAllTypes = - std::regex_replace(replacedWindowHeightOverview, - std::regex("NESMIK_REPLACE_LEVELS"), allTypesString); + auto replacedWindowSemanticMaxOverview = std::regex_replace( + replacedWindowHeightOverview, std::regex("NESMIK_REPLACE_SEMANTIC_MAX"), + std::to_string(numberOfRegionsRegistered)); + auto overviewReplacedAllTypes = std::regex_replace( + replacedWindowSemanticMaxOverview, std::regex("NESMIK_REPLACE_LEVELS"), + allTypesString); // write Overview outputFile << overviewReplacedAllTypes; @@ -252,8 +259,11 @@ void ExtraeTypeStackStrategy::Finalize() noexcept { std::to_string( (paraverConfigWindowHeight_ + paraverConfigWindowHeightPad_) * (level + 2 /* offset with overview window */))); + auto replacedWindowSemanticMax = std::regex_replace( + replacedWindowHeight, std::regex("NESMIK_REPLACE_SEMANTIC_MAX"), + std::to_string(numberOfRegionsRegistered)); auto replacedWindowName = std::regex_replace( - replacedWindowYPosition, std::regex("NESMIK_REPLACE_WINDOW_NAME"), + replacedWindowSemanticMax, std::regex("NESMIK_REPLACE_WINDOW_NAME"), windowName); // write Overview -- GitLab From 86a0aa0116442660c534bd8774ab2dceebb0117a Mon Sep 17 00:00:00 2001 From: JOAN VINYALS YLLA CATALA Date: Tue, 9 Jul 2024 12:49:26 +0200 Subject: [PATCH 2/4] Fixed format --- src/backends/extrae/extrae_type_stack.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backends/extrae/extrae_type_stack.cpp b/src/backends/extrae/extrae_type_stack.cpp index a33b26e..2dee840 100644 --- a/src/backends/extrae/extrae_type_stack.cpp +++ b/src/backends/extrae/extrae_type_stack.cpp @@ -234,9 +234,9 @@ void ExtraeTypeStackStrategy::Finalize() noexcept { auto replacedWindowSemanticMaxOverview = std::regex_replace( replacedWindowHeightOverview, std::regex("NESMIK_REPLACE_SEMANTIC_MAX"), std::to_string(numberOfRegionsRegistered)); - auto overviewReplacedAllTypes = std::regex_replace( - replacedWindowSemanticMaxOverview, std::regex("NESMIK_REPLACE_LEVELS"), - allTypesString); + auto overviewReplacedAllTypes = + std::regex_replace(replacedWindowSemanticMaxOverview, + std::regex("NESMIK_REPLACE_LEVELS"), allTypesString); // write Overview outputFile << overviewReplacedAllTypes; -- GitLab From ae1150d34cee3661ae51bfeda16eb94232f197bb Mon Sep 17 00:00:00 2001 From: JOSEP POCURULL SERRA Date: Tue, 9 Jul 2024 12:57:57 +0200 Subject: [PATCH 3/4] Fix pipeline of replaces --- src/backends/extrae/extrae_type_stack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/extrae/extrae_type_stack.cpp b/src/backends/extrae/extrae_type_stack.cpp index 2dee840..787809f 100644 --- a/src/backends/extrae/extrae_type_stack.cpp +++ b/src/backends/extrae/extrae_type_stack.cpp @@ -260,7 +260,7 @@ void ExtraeTypeStackStrategy::Finalize() noexcept { (paraverConfigWindowHeight_ + paraverConfigWindowHeightPad_) * (level + 2 /* offset with overview window */))); auto replacedWindowSemanticMax = std::regex_replace( - replacedWindowHeight, std::regex("NESMIK_REPLACE_SEMANTIC_MAX"), + replacedWindowYPosition, std::regex("NESMIK_REPLACE_SEMANTIC_MAX"), std::to_string(numberOfRegionsRegistered)); auto replacedWindowName = std::regex_replace( replacedWindowSemanticMax, std::regex("NESMIK_REPLACE_WINDOW_NAME"), -- GitLab From 8b5c4055a41c768bebf44639b125d576a4a91be0 Mon Sep 17 00:00:00 2001 From: JOAN VINYALS YLLA CATALA Date: Tue, 9 Jul 2024 13:04:14 +0200 Subject: [PATCH 4/4] Fix paraver cfg semantic clause --- src/backends/extrae/extrae_type_stack.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backends/extrae/extrae_type_stack.cpp b/src/backends/extrae/extrae_type_stack.cpp index 787809f..97e472c 100644 --- a/src/backends/extrae/extrae_type_stack.cpp +++ b/src/backends/extrae/extrae_type_stack.cpp @@ -52,8 +52,8 @@ window_intercomms_enabled true window_comm_fromto true window_comm_tagsize true window_comm_typeval true -window_y_maximum NESMIK_REPLACE_SEMANTIC_MAX -window_y_minimum 0 +window_maximum_y NESMIK_REPLACE_SEMANTIC_MAX +window_minimum_y 0 window_compute_y_max false window_level thread window_scale_relative 1.000000000000 @@ -93,8 +93,8 @@ window_intercomms_enabled true window_comm_fromto true window_comm_tagsize true window_comm_typeval true -window_y_maximum NESMIK_REPLACE_SEMANTIC_MAX -window_y_minimum 0 +window_maximum_y NESMIK_REPLACE_SEMANTIC_MAX +window_minimum_y 0 window_compute_y_max false window_level thread window_scale_relative 1.000000000000 -- GitLab