diff --git a/src/core/counters/basic/gfx_metrics.xml b/src/core/counters/basic/gfx_metrics.xml
index 6382c647de..d4c1f462be 100755
--- a/src/core/counters/basic/gfx_metrics.xml
+++ b/src/core/counters/basic/gfx_metrics.xml
@@ -693,4 +693,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/core/counters/derived/metrics.xml b/src/core/counters/derived/metrics.xml
index dd479d72d2..b5ef65cb4d 100755
--- a/src/core/counters/derived/metrics.xml
+++ b/src/core/counters/derived/metrics.xml
@@ -424,4 +424,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/core/counters/metrics/basic_counters.xml b/src/core/counters/metrics/basic_counters.xml
index cc7fd0cd6e..ba2275accf 100755
--- a/src/core/counters/metrics/basic_counters.xml
+++ b/src/core/counters/metrics/basic_counters.xml
@@ -681,3 +681,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/core/counters/metrics/derived_counters.xml b/src/core/counters/metrics/derived_counters.xml
index 417b4b5dca..b32c950728 100755
--- a/src/core/counters/metrics/derived_counters.xml
+++ b/src/core/counters/metrics/derived_counters.xml
@@ -462,9 +462,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# Vega20
# Arcturus
@@ -473,10 +505,12 @@
#Navi21
-
-
+#Navi31
+
+
+
# GPUBusy The percentage of time GPU was busy.
diff --git a/src/core/counters/metrics/metrics.h b/src/core/counters/metrics/metrics.h
index f07bb47e9a..d33c2849be 100755
--- a/src/core/counters/metrics/metrics.h
+++ b/src/core/counters/metrics/metrics.h
@@ -205,7 +205,8 @@ class MetricsDict {
agent_name_ = agent_info->getName();
if (std::string("gfx906") == agent_name_ || std::string("gfx908") == agent_name_ ||
std::string("gfx90a") == agent_name_ || std::string("gfx1032") == agent_name_ ||
- std::string("gfx1031") == agent_name_ || std::string("gfx1030") == agent_name_) {
+ std::string("gfx1031") == agent_name_ || std::string("gfx1030") == agent_name_ ||
+ std::string("gfx1100") == agent_name_ || std::string("gfx1101") == agent_name_) {
ImportMetrics(agent_info, agent_name_);
} else {
agent_name_ = agent_info->getGfxip();
diff --git a/src/core/metrics.h b/src/core/metrics.h
index e88a6c7c2f..9ce4489252 100755
--- a/src/core/metrics.h
+++ b/src/core/metrics.h
@@ -200,10 +200,10 @@ class MetricsDict {
std::string("gfx908") == agent_info->name ||
std::string("gfx90a") == agent_info->name ||
std::string("gfx1032") == agent_info->name ||
- std::string("gfx1031") == agent_info->name ||
+ std::string("gfx1031") == agent_info->name ||
std::string("gfx1030") == agent_info->name ||
std::string("gfx1100") == agent_info->name ||
- std::string("gfx1101") == agent_info->name){
+ std::string("gfx1101") == agent_info->name) {
ImportMetrics(agent_info, agent_info->name);
} else {
agent_name_ = agent_info->gfxip;