Adding AID dimension for UMC support (#886)

* Adding AID dimension for UMC support

* fix for parser.reduction test
Cette révision appartient à :
Saurabh Verma
2024-05-29 15:09:56 -05:00
révisé par GitHub
Parent c0542cbfb2
révision 665fd567eb
4 fichiers modifiés avec 13 ajouts et 9 suppressions
+6 -5
Voir le fichier
@@ -44,11 +44,12 @@ enum DimensionTypes
{
DIMENSION_NONE = 0,
DIMENSION_XCC = 1 << 0,
DIMENSION_SHADER_ENGINE = 1 << 1,
DIMENSION_AGENT = 1 << 2,
DIMENSION_PMC_CHANNEL = 1 << 3,
DIMENSION_CU = 1 << 4,
DIMENSION_LAST = 1 << 5,
DIMENSION_AID = 1 << 1,
DIMENSION_SHADER_ENGINE = 1 << 2,
DIMENSION_AGENT = 1 << 3,
DIMENSION_PMC_CHANNEL = 1 << 4,
DIMENSION_CU = 1 << 5,
DIMENSION_LAST = 1 << 6,
};
enum ReduceOperation
+2
Voir le fichier
@@ -39,6 +39,7 @@ dimension_map()
static auto*& _v = common::static_object<DimensionMap>::construct(DimensionMap{
{ROCPROFILER_DIMENSION_NONE, std::string_view("DIMENSION_NONE")},
{ROCPROFILER_DIMENSION_XCC, std::string_view("DIMENSION_XCC")},
{ROCPROFILER_DIMENSION_AID, std::string_view("DIMENSION_AID")},
{ROCPROFILER_DIMENSION_SHADER_ENGINE, std::string_view("DIMENSION_SHADER_ENGINE")},
{ROCPROFILER_DIMENSION_AGENT, std::string_view("DIMENSION_AGENT")},
{ROCPROFILER_DIMENSION_SHADER_ARRAY, std::string_view("DIMENSION_SHADER_ARRAY")},
@@ -63,6 +64,7 @@ aqlprofile_id_to_rocprof_instance()
rocprofiler_profile_counter_instance_types>
aql_string_to_dim = {
{"XCD", ROCPROFILER_DIMENSION_XCC},
{"AID", ROCPROFILER_DIMENSION_AID},
{"SE", ROCPROFILER_DIMENSION_SHADER_ENGINE},
{"SA", ROCPROFILER_DIMENSION_SHADER_ARRAY},
{"CU", ROCPROFILER_DIMENSION_CU},
+1
Voir le fichier
@@ -41,6 +41,7 @@ enum rocprofiler_profile_counter_instance_types
{
ROCPROFILER_DIMENSION_NONE = 0, ///< No dimension data, returns/sets 48 bit value as is
ROCPROFILER_DIMENSION_XCC, ///< XCC dimension of result
ROCPROFILER_DIMENSION_AID, ///< AID dimension of result
ROCPROFILER_DIMENSION_SHADER_ENGINE, ///< SE dimension of result
ROCPROFILER_DIMENSION_AGENT, ///< Agent dimension
ROCPROFILER_DIMENSION_SHADER_ARRAY, ///< Number of shader arrays
+4 -4
Voir le fichier
@@ -148,7 +148,7 @@ TEST(parser, reduction)
"{\"Type\":\"REDUCE_NODE\", \"REDUCE_OP\":\"SUM\", "
"\"Counter_Set\":[{\"Type\":\"REFERENCE_NODE\", \"REDUCE_OP\":\"\", \"Value\":\"AB\", "
"\"Counter_Set\":[], \"Reduce_Dimension_Set\":[], \"Select_Dimension_Set\":[]}], "
"\"Reduce_Dimension_Set\":[\"2\",\"1\"], \"Select_Dimension_Set\":[]}"},
"\"Reduce_Dimension_Set\":[\"3\",\"1\"], \"Select_Dimension_Set\":[]}"},
{"reduce(AB+CD, SUM, [DIMENSION_XCC,DIMENSION_SHADER_ENGINE])",
"{\"Type\":\"REDUCE_NODE\", \"REDUCE_OP\":\"SUM\", "
"\"Counter_Set\":[{\"Type\":\"ADDITION_NODE\", \"REDUCE_OP\":\"\", "
@@ -157,7 +157,7 @@ TEST(parser, reduction)
"\"Select_Dimension_Set\":[]},{\"Type\":\"REFERENCE_NODE\", \"REDUCE_OP\":\"\", "
"\"Value\":\"CD\", \"Counter_Set\":[], \"Reduce_Dimension_Set\":[], "
"\"Select_Dimension_Set\":[]}], \"Reduce_Dimension_Set\":[], "
"\"Select_Dimension_Set\":[]}], \"Reduce_Dimension_Set\":[\"2\",\"1\"], "
"\"Select_Dimension_Set\":[]}], \"Reduce_Dimension_Set\":[\"3\",\"1\"], "
"\"Select_Dimension_Set\":[]}"},
{"reduce(AB,DIV, [DIMENSION_XCC,DIMENSION_SHADER_ENGINE])+reduce(DC,SUM, "
"[DIMENSION_XCC,DIMENSION_SHADER_ENGINE])",
@@ -165,11 +165,11 @@ TEST(parser, reduction)
"\"Counter_Set\":[{\"Type\":\"REDUCE_NODE\", \"REDUCE_OP\":\"DIV\", "
"\"Counter_Set\":[{\"Type\":\"REFERENCE_NODE\", \"REDUCE_OP\":\"\", \"Value\":\"AB\", "
"\"Counter_Set\":[], \"Reduce_Dimension_Set\":[], \"Select_Dimension_Set\":[]}], "
"\"Reduce_Dimension_Set\":[\"2\",\"1\"], "
"\"Reduce_Dimension_Set\":[\"3\",\"1\"], "
"\"Select_Dimension_Set\":[]},{\"Type\":\"REDUCE_NODE\", \"REDUCE_OP\":\"SUM\", "
"\"Counter_Set\":[{\"Type\":\"REFERENCE_NODE\", \"REDUCE_OP\":\"\", \"Value\":\"DC\", "
"\"Counter_Set\":[], \"Reduce_Dimension_Set\":[], \"Select_Dimension_Set\":[]}], "
"\"Reduce_Dimension_Set\":[\"2\",\"1\"], \"Select_Dimension_Set\":[]}], "
"\"Reduce_Dimension_Set\":[\"3\",\"1\"], \"Select_Dimension_Set\":[]}], "
"\"Reduce_Dimension_Set\":[], \"Select_Dimension_Set\":[]}"}};
for(auto [op, expected] : expressionToExpected)