Minor "ReadMetricSetsFromFileBuffer" fix and Metric equation resolving fix. (#54)

lfrymark-pl · web-flow · commit 270e5a39f2ca · 2022-10-14T14:11:19.000+02:00
* Minor "ReadMetricSetsFromFileBuffer" fix

Removing platformMask when it is no longer needed.


* Metric equation resolving fix.

Return 0 for a global symbol that is not available.
Fix for SLM_BANK_CONFLICT_COUNT metric.
diff --git a/inc/common/instrumentation/api/metrics_discovery_api.h b/inc/common/instrumentation/api/metrics_discovery_api.h
@@ -37,7 +37,7 @@ SPDX-License-Identifier: MIT
 //////////////////////////////////////////////////////////////////////////////////
 // API build number:
 //////////////////////////////////////////////////////////////////////////////////
-#define MD_API_BUILD_NUMBER_CURRENT 156
+#define MD_API_BUILD_NUMBER_CURRENT 157
 
 namespace MetricsDiscovery
 {
diff --git a/instrumentation/metrics_discovery/codegen/md_metrics_PVC_GT1.cpp b/instrumentation/metrics_discovery/codegen/md_metrics_PVC_GT1.cpp
@@ -5058,8 +5058,8 @@ static TCompletionCode CreateMetricSet_PVC_GT1_L1ProfileSlmBankConflicts_XeCore4
         METRIC_TYPE_EVENT, RESULT_UINT64, "events", 0, 0, HW_UNIT_GPU, availabilityEquation, nullptr, nullptr, 3 );
     if( metric )
     {
-        MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportReadEquation( "2 dw@0xfc 2 dw@0xf8 UMUL UADD 4 dw@0xf4 UMUL UADD 8 dw@0xf0 UMUL UADD dw@0xec 2 dw@0xe8 UMUL UADD 4 dw@0xe4 UMUL UADD 8 dw@0xe0 UMUL UADD UADD dw@0xdc 2 dw@0xd8 UMUL UADD 4 dw@0xd4 UMUL UADD 8 dw@0xd0 UMUL UADD UADD dw@0xcc 2 dw@0xc8 UMUL UADD 4 dw@0xc4 UMUL UADD 8 dw@0xc0 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore0 $GtSlice1XeCore0 UADD $GtSlice2XeCore0 UADD $GtSlice3XeCore0 UADD $GtSlice4XeCore0 UADD $GtSlice5XeCore0 UADD $GtSlice6XeCore0 UADD $GtSlice7XeCore0 UADD UDIV" ));
-        MD_CHECK_CC_RET_A( adapterId, metric->SetDeltaReportReadEquation( "2 qw@0x1b8 2 qw@0x1b0 UMUL UADD 4 qw@0x1a8 UMUL UADD 8 qw@0x1a0 UMUL UADD qw@0x198 2 qw@0x190 UMUL UADD 4 qw@0x188 UMUL UADD 8 qw@0x180 UMUL UADD UADD qw@0x178 2 qw@0x170 UMUL UADD 4 qw@0x168 UMUL UADD 8 qw@0x160 UMUL UADD UADD qw@0x158 2 qw@0x150 UMUL UADD 4 qw@0x148 UMUL UADD 8 qw@0x140 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore0 $GtSlice1XeCore0 UADD $GtSlice2XeCore0 UADD $GtSlice3XeCore0 UADD $GtSlice4XeCore0 UADD $GtSlice5XeCore0 UADD $GtSlice6XeCore0 UADD $GtSlice7XeCore0 UADD UDIV" ));
+        MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportReadEquation( "2 dw@0xfc 2 dw@0xf8 UMUL UADD 4 dw@0xf4 UMUL UADD 8 dw@0xf0 UMUL UADD dw@0xec 2 dw@0xe8 UMUL UADD 4 dw@0xe4 UMUL UADD 8 dw@0xe0 UMUL UADD UADD dw@0xdc 2 dw@0xd8 UMUL UADD 4 dw@0xd4 UMUL UADD 8 dw@0xd0 UMUL UADD UADD dw@0xcc 2 dw@0xc8 UMUL UADD 4 dw@0xc4 UMUL UADD 8 dw@0xc0 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore4 $GtSlice1XeCore4 UADD $GtSlice2XeCore4 UADD $GtSlice3XeCore4 UADD $GtSlice4XeCore4 UADD $GtSlice5XeCore4 UADD $GtSlice6XeCore4 UADD $GtSlice7XeCore4 UADD UDIV" ));
+        MD_CHECK_CC_RET_A( adapterId, metric->SetDeltaReportReadEquation( "2 qw@0x1b8 2 qw@0x1b0 UMUL UADD 4 qw@0x1a8 UMUL UADD 8 qw@0x1a0 UMUL UADD qw@0x198 2 qw@0x190 UMUL UADD 4 qw@0x188 UMUL UADD 8 qw@0x180 UMUL UADD UADD qw@0x178 2 qw@0x170 UMUL UADD 4 qw@0x168 UMUL UADD 8 qw@0x160 UMUL UADD UADD qw@0x158 2 qw@0x150 UMUL UADD 4 qw@0x148 UMUL UADD 8 qw@0x140 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore4 $GtSlice1XeCore4 UADD $GtSlice2XeCore4 UADD $GtSlice3XeCore4 UADD $GtSlice4XeCore4 UADD $GtSlice5XeCore4 UADD $GtSlice6XeCore4 UADD $GtSlice7XeCore4 UADD UDIV" ));
         MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportDeltaFunction( "DELTA 32" ));
     }
 
diff --git a/instrumentation/metrics_discovery/codegen/md_metrics_PVC_GT2.cpp b/instrumentation/metrics_discovery/codegen/md_metrics_PVC_GT2.cpp
@@ -14131,8 +14131,8 @@ static TCompletionCode CreateMetricSet_PVC_GT2_L1ProfileSlmBankConflicts_XeCore4
         METRIC_TYPE_EVENT, RESULT_UINT64, "events", 0, 0, HW_UNIT_GPU, availabilityEquation, nullptr, nullptr, 3 );
     if( metric )
     {
-        MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportReadEquation( "2 dw@0xfc 2 dw@0xf8 UMUL UADD 4 dw@0xf4 UMUL UADD 8 dw@0xf0 UMUL UADD dw@0xec 2 dw@0xe8 UMUL UADD 4 dw@0xe4 UMUL UADD 8 dw@0xe0 UMUL UADD UADD dw@0xdc 2 dw@0xd8 UMUL UADD 4 dw@0xd4 UMUL UADD 8 dw@0xd0 UMUL UADD UADD dw@0xcc 2 dw@0xc8 UMUL UADD 4 dw@0xc4 UMUL UADD 8 dw@0xc0 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore0 $GtSlice1XeCore0 UADD $GtSlice2XeCore0 UADD $GtSlice3XeCore0 UADD $GtSlice4XeCore0 UADD $GtSlice5XeCore0 UADD $GtSlice6XeCore0 UADD $GtSlice7XeCore0 UADD UDIV" ));
-        MD_CHECK_CC_RET_A( adapterId, metric->SetDeltaReportReadEquation( "2 qw@0x1b8 2 qw@0x1b0 UMUL UADD 4 qw@0x1a8 UMUL UADD 8 qw@0x1a0 UMUL UADD qw@0x198 2 qw@0x190 UMUL UADD 4 qw@0x188 UMUL UADD 8 qw@0x180 UMUL UADD UADD qw@0x178 2 qw@0x170 UMUL UADD 4 qw@0x168 UMUL UADD 8 qw@0x160 UMUL UADD UADD qw@0x158 2 qw@0x150 UMUL UADD 4 qw@0x148 UMUL UADD 8 qw@0x140 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore0 $GtSlice1XeCore0 UADD $GtSlice2XeCore0 UADD $GtSlice3XeCore0 UADD $GtSlice4XeCore0 UADD $GtSlice5XeCore0 UADD $GtSlice6XeCore0 UADD $GtSlice7XeCore0 UADD UDIV" ));
+        MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportReadEquation( "2 dw@0xfc 2 dw@0xf8 UMUL UADD 4 dw@0xf4 UMUL UADD 8 dw@0xf0 UMUL UADD dw@0xec 2 dw@0xe8 UMUL UADD 4 dw@0xe4 UMUL UADD 8 dw@0xe0 UMUL UADD UADD dw@0xdc 2 dw@0xd8 UMUL UADD 4 dw@0xd4 UMUL UADD 8 dw@0xd0 UMUL UADD UADD dw@0xcc 2 dw@0xc8 UMUL UADD 4 dw@0xc4 UMUL UADD 8 dw@0xc0 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore4 $GtSlice1XeCore4 UADD $GtSlice2XeCore4 UADD $GtSlice3XeCore4 UADD $GtSlice4XeCore4 UADD $GtSlice5XeCore4 UADD $GtSlice6XeCore4 UADD $GtSlice7XeCore4 UADD UDIV" ));
+        MD_CHECK_CC_RET_A( adapterId, metric->SetDeltaReportReadEquation( "2 qw@0x1b8 2 qw@0x1b0 UMUL UADD 4 qw@0x1a8 UMUL UADD 8 qw@0x1a0 UMUL UADD qw@0x198 2 qw@0x190 UMUL UADD 4 qw@0x188 UMUL UADD 8 qw@0x180 UMUL UADD UADD qw@0x178 2 qw@0x170 UMUL UADD 4 qw@0x168 UMUL UADD 8 qw@0x160 UMUL UADD UADD qw@0x158 2 qw@0x150 UMUL UADD 4 qw@0x148 UMUL UADD 8 qw@0x140 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore4 $GtSlice1XeCore4 UADD $GtSlice2XeCore4 UADD $GtSlice3XeCore4 UADD $GtSlice4XeCore4 UADD $GtSlice5XeCore4 UADD $GtSlice6XeCore4 UADD $GtSlice7XeCore4 UADD UDIV" ));
         MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportDeltaFunction( "DELTA 32" ));
     }
 
diff --git a/instrumentation/metrics_discovery/common/internal/md_metrics_device.cpp b/instrumentation/metrics_discovery/common/internal/md_metrics_device.cpp
@@ -860,6 +860,8 @@ namespace MetricsDiscoveryInternal
             {
                 MD_LOG_A( adapterId, LOG_DEBUG, "set not added, using existing one: %s", metricSetParams.ShortName );
             }
+            // platformMask is stored in metric set. iu_memcpy_s used.
+            DeleteByteArray( platformMask, adapterId );
 
             // ApiSpecificId
             apiSpecificId.D3D9QueryId           = ReadUInt32FromFileBuffer( bufferPtr, adapterId );
diff --git a/instrumentation/metrics_discovery/common/md_calculation.cpp b/instrumentation/metrics_discovery/common/md_calculation.cpp
@@ -1116,6 +1116,13 @@ namespace MetricsDiscoveryInternal
                     break;
                 }
 
+                case EQUATION_ELEM_LOCAL_COUNTER_SYMBOL:
+                    typedValue.ValueUInt64 = 0LL;
+                    typedValue.ValueType   = VALUE_TYPE_UINT64;
+                    isValid                = EquationStackPush( equationStack, typedValue, algorithmCheck );
+                    // Asserts, because this is not a valid condition
+                    [[fallthrough]];
+
                 default:
                     MD_ASSERT_A( adapterId, false );
                     break;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ SPDX-License-Identifier: MIT`
`37`	`37`	`//////////////////////////////////////////////////////////////////////////////////`
`38`	`38`	`// API build number:`
`39`	`39`	`//////////////////////////////////////////////////////////////////////////////////`
`40`		`-#define MD_API_BUILD_NUMBER_CURRENT 156`
	`40`	`+#define MD_API_BUILD_NUMBER_CURRENT 157`
`41`	`41`
`42`	`42`	`namespace MetricsDiscovery`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5058,8 +5058,8 @@ static TCompletionCode CreateMetricSet_PVC_GT1_L1ProfileSlmBankConflicts_XeCore4`
`5058`	`5058`	`METRIC_TYPE_EVENT, RESULT_UINT64, "events", 0, 0, HW_UNIT_GPU, availabilityEquation, nullptr, nullptr, 3 );`
`5059`	`5059`	`if( metric )`
`5060`	`5060`	`{`
`5061`		- MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportReadEquation( "2 dw@0xfc 2 dw@0xf8 UMUL UADD 4 dw@0xf4 UMUL UADD 8 dw@0xf0 UMUL UADD dw@0xec 2 dw@0xe8 UMUL UADD 4 dw@0xe4 UMUL UADD 8 dw@0xe0 UMUL UADD UADD dw@0xdc 2 dw@0xd8 UMUL UADD 4 dw@0xd4 UMUL UADD 8 dw@0xd0 UMUL UADD UADD dw@0xcc 2 dw@0xc8 UMUL UADD 4 dw@0xc4 UMUL UADD 8 dw@0xc0 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore0 $GtSlice1XeCore0 UADD $GtSlice2XeCore0 UADD $GtSlice3XeCore0 UADD $GtSlice4XeCore0 UADD $GtSlice5XeCore0 UADD $GtSlice6XeCore0 UADD $GtSlice7XeCore0 UADD UDIV" ));
`5062`		- MD_CHECK_CC_RET_A( adapterId, metric->SetDeltaReportReadEquation( "2 qw@0x1b8 2 qw@0x1b0 UMUL UADD 4 qw@0x1a8 UMUL UADD 8 qw@0x1a0 UMUL UADD qw@0x198 2 qw@0x190 UMUL UADD 4 qw@0x188 UMUL UADD 8 qw@0x180 UMUL UADD UADD qw@0x178 2 qw@0x170 UMUL UADD 4 qw@0x168 UMUL UADD 8 qw@0x160 UMUL UADD UADD qw@0x158 2 qw@0x150 UMUL UADD 4 qw@0x148 UMUL UADD 8 qw@0x140 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore0 $GtSlice1XeCore0 UADD $GtSlice2XeCore0 UADD $GtSlice3XeCore0 UADD $GtSlice4XeCore0 UADD $GtSlice5XeCore0 UADD $GtSlice6XeCore0 UADD $GtSlice7XeCore0 UADD UDIV" ));
	`5061`	+ MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportReadEquation( "2 dw@0xfc 2 dw@0xf8 UMUL UADD 4 dw@0xf4 UMUL UADD 8 dw@0xf0 UMUL UADD dw@0xec 2 dw@0xe8 UMUL UADD 4 dw@0xe4 UMUL UADD 8 dw@0xe0 UMUL UADD UADD dw@0xdc 2 dw@0xd8 UMUL UADD 4 dw@0xd4 UMUL UADD 8 dw@0xd0 UMUL UADD UADD dw@0xcc 2 dw@0xc8 UMUL UADD 4 dw@0xc4 UMUL UADD 8 dw@0xc0 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore4 $GtSlice1XeCore4 UADD $GtSlice2XeCore4 UADD $GtSlice3XeCore4 UADD $GtSlice4XeCore4 UADD $GtSlice5XeCore4 UADD $GtSlice6XeCore4 UADD $GtSlice7XeCore4 UADD UDIV" ));
	`5062`	+ MD_CHECK_CC_RET_A( adapterId, metric->SetDeltaReportReadEquation( "2 qw@0x1b8 2 qw@0x1b0 UMUL UADD 4 qw@0x1a8 UMUL UADD 8 qw@0x1a0 UMUL UADD qw@0x198 2 qw@0x190 UMUL UADD 4 qw@0x188 UMUL UADD 8 qw@0x180 UMUL UADD UADD qw@0x178 2 qw@0x170 UMUL UADD 4 qw@0x168 UMUL UADD 8 qw@0x160 UMUL UADD UADD qw@0x158 2 qw@0x150 UMUL UADD 4 qw@0x148 UMUL UADD 8 qw@0x140 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore4 $GtSlice1XeCore4 UADD $GtSlice2XeCore4 UADD $GtSlice3XeCore4 UADD $GtSlice4XeCore4 UADD $GtSlice5XeCore4 UADD $GtSlice6XeCore4 UADD $GtSlice7XeCore4 UADD UDIV" ));
`5063`	`5063`	`MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportDeltaFunction( "DELTA 32" ));`
`5064`	`5064`	`}`
`5065`	`5065`
Original file line number	Diff line number	Diff line change
`@@ -14131,8 +14131,8 @@ static TCompletionCode CreateMetricSet_PVC_GT2_L1ProfileSlmBankConflicts_XeCore4`
`14131`	`14131`	`METRIC_TYPE_EVENT, RESULT_UINT64, "events", 0, 0, HW_UNIT_GPU, availabilityEquation, nullptr, nullptr, 3 );`
`14132`	`14132`	`if( metric )`
`14133`	`14133`	`{`
`14134`		- MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportReadEquation( "2 dw@0xfc 2 dw@0xf8 UMUL UADD 4 dw@0xf4 UMUL UADD 8 dw@0xf0 UMUL UADD dw@0xec 2 dw@0xe8 UMUL UADD 4 dw@0xe4 UMUL UADD 8 dw@0xe0 UMUL UADD UADD dw@0xdc 2 dw@0xd8 UMUL UADD 4 dw@0xd4 UMUL UADD 8 dw@0xd0 UMUL UADD UADD dw@0xcc 2 dw@0xc8 UMUL UADD 4 dw@0xc4 UMUL UADD 8 dw@0xc0 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore0 $GtSlice1XeCore0 UADD $GtSlice2XeCore0 UADD $GtSlice3XeCore0 UADD $GtSlice4XeCore0 UADD $GtSlice5XeCore0 UADD $GtSlice6XeCore0 UADD $GtSlice7XeCore0 UADD UDIV" ));
`14135`		- MD_CHECK_CC_RET_A( adapterId, metric->SetDeltaReportReadEquation( "2 qw@0x1b8 2 qw@0x1b0 UMUL UADD 4 qw@0x1a8 UMUL UADD 8 qw@0x1a0 UMUL UADD qw@0x198 2 qw@0x190 UMUL UADD 4 qw@0x188 UMUL UADD 8 qw@0x180 UMUL UADD UADD qw@0x178 2 qw@0x170 UMUL UADD 4 qw@0x168 UMUL UADD 8 qw@0x160 UMUL UADD UADD qw@0x158 2 qw@0x150 UMUL UADD 4 qw@0x148 UMUL UADD 8 qw@0x140 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore0 $GtSlice1XeCore0 UADD $GtSlice2XeCore0 UADD $GtSlice3XeCore0 UADD $GtSlice4XeCore0 UADD $GtSlice5XeCore0 UADD $GtSlice6XeCore0 UADD $GtSlice7XeCore0 UADD UDIV" ));
	`14134`	+ MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportReadEquation( "2 dw@0xfc 2 dw@0xf8 UMUL UADD 4 dw@0xf4 UMUL UADD 8 dw@0xf0 UMUL UADD dw@0xec 2 dw@0xe8 UMUL UADD 4 dw@0xe4 UMUL UADD 8 dw@0xe0 UMUL UADD UADD dw@0xdc 2 dw@0xd8 UMUL UADD 4 dw@0xd4 UMUL UADD 8 dw@0xd0 UMUL UADD UADD dw@0xcc 2 dw@0xc8 UMUL UADD 4 dw@0xc4 UMUL UADD 8 dw@0xc0 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore4 $GtSlice1XeCore4 UADD $GtSlice2XeCore4 UADD $GtSlice3XeCore4 UADD $GtSlice4XeCore4 UADD $GtSlice5XeCore4 UADD $GtSlice6XeCore4 UADD $GtSlice7XeCore4 UADD UDIV" ));
	`14135`	+ MD_CHECK_CC_RET_A( adapterId, metric->SetDeltaReportReadEquation( "2 qw@0x1b8 2 qw@0x1b0 UMUL UADD 4 qw@0x1a8 UMUL UADD 8 qw@0x1a0 UMUL UADD qw@0x198 2 qw@0x190 UMUL UADD 4 qw@0x188 UMUL UADD 8 qw@0x180 UMUL UADD UADD qw@0x178 2 qw@0x170 UMUL UADD 4 qw@0x168 UMUL UADD 8 qw@0x160 UMUL UADD UADD qw@0x158 2 qw@0x150 UMUL UADD 4 qw@0x148 UMUL UADD 8 qw@0x140 UMUL UADD UADD UMUL $XeCoreTotalCount UMUL $GtSlice0XeCore4 $GtSlice1XeCore4 UADD $GtSlice2XeCore4 UADD $GtSlice3XeCore4 UADD $GtSlice4XeCore4 UADD $GtSlice5XeCore4 UADD $GtSlice6XeCore4 UADD $GtSlice7XeCore4 UADD UDIV" ));
`14136`	`14136`	`MD_CHECK_CC_RET_A( adapterId, metric->SetSnapshotReportDeltaFunction( "DELTA 32" ));`
`14137`	`14137`	`}`
`14138`	`14138`
Original file line number	Diff line number	Diff line change
`@@ -860,6 +860,8 @@ namespace MetricsDiscoveryInternal`
`860`	`860`	`{`
`861`	`861`	`MD_LOG_A( adapterId, LOG_DEBUG, "set not added, using existing one: %s", metricSetParams.ShortName );`
`862`	`862`	`}`
	`863`	`+ // platformMask is stored in metric set. iu_memcpy_s used.`
	`864`	`+ DeleteByteArray( platformMask, adapterId );`
`863`	`865`
`864`	`866`	`// ApiSpecificId`
`865`	`867`	`apiSpecificId.D3D9QueryId = ReadUInt32FromFileBuffer( bufferPtr, adapterId );`