Merge ~bullwinkle-team/ubuntu/+source/rocm-smi-lib:bullwinkle/ubuntu/devel into ubuntu/+source/rocm-smi-lib:ubuntu/devel

[Talha Can Havadar]

New upstream version 7.1.0

Tested this package in:
https://launchpad.net/~bullwinkle-team/+archive/ubuntu/rocm-devel
And here in this ppa where I experimented with upstream llvm:
https://launchpad.net/~tchavadar/+archive/ubuntu/rocm-with-llvm-21

Also built llama.cpp snap (indirectly depends this package):
https://github.com/talhaHavadar/snap-llama.cpp

Functionally things seems to be working ok.

[Andreas Hasenack (ahasenack)]

005-use-debian-version-when-available.patch

Didn't we have a similar problem with another package a while back?

Getting the version from d/changelog sounds wrong, since the upstream code should have the version number somewhere.

But just as an opportunity, you should not parse the changelog manually, there is dpkg-parsechangelog for that. For example:

$ dpkg-parsechangelog -Sversion
7.1.0-0ubuntu1

review: Needs Fixing

[Talha Can Havadar (tchavadar)]

Why do we have this change in rocm-smi-lib?

d/control:
```
-Architecture: linux-any
+Architecture: amd64 arm64
```

review: Needs Information

[Talha Can Havadar (tchavadar)]

Also about b/debian/patches/0005-use-debian-version-when-available.patch should we make sure debian has this fix? because other than this change we dont have a significant diff with https://salsa.debian.org/rocm-team/rocm-smi-lib/-/tree/debian/unstable/debian?ref_type=heads

Based on our previous discussions, having ubuntu suffix in the version would block the sync from debian but I dont see a real need to block the sync from debian for rocm-smi-lib (this doesnt depend on amd llvm fork)

review: Needs Information

[Igor Luppi (igorluppi)]

Please @Talha, take a second review. I have changed the patch and also the soversion. Thanks!!

[Talha Can Havadar (tchavadar)]

see the build failure here: https://launchpadlibrarian.net/838266901/buildlog_ubuntu-resolute-amd64v3.rocm-smi-lib_7.1.0-0ubuntu1+dev29git202512180832.4e447b9_BUILDING.txt.gz

[Talha Can Havadar (tchavadar)]

I just updated the branch with the fix and gonna merge this to bullwinkle/ubuntu/devel

[Talha Can Havadar (tchavadar)]

igor can you change propsed branch to bullwinkle/ubuntu/devel instead of bullwinkle/ubuntu/devel-7.1.0-0ubuntu1

[Igor Luppi (igorluppi)]

review: Approve

[Talha Can Havadar (tchavadar)]

created https://launchpad.net/~tchavadar/+archive/ubuntu/lp2138653 PPA just for this package, enabled proposed as dependency including all arch to not miss any possible issues

[Frank Heimes (fheimes)]

First of all thanks for this significant work!

I have a few / the following thoughts:
- I am surprised that this ROCm package also builds for platforms other than amd64, amd64v3
  I haven't expected that - it builds also for arm64, armhf, ppc64el and s390x
  (The previous version even for i386 and riscv64.)
  Does that make sense? Especially the librocm-"smi64" armhf ?
  In d/control I see that the architecture is 'linux-any' - might make sense to limit this more.
  (But if all these arch. are upstream supported and work fine, ignore my ignorance, but then the symbols
   file would need to be available for more than amd64.)
- I bumped into the above because there is only a liboam7.symbols file for amd64.
  (Hence lintian, running on the binary DEBs, complains about the missing symbols file for all other
   architectures.)
- Then I believe that version 7.1.0-0ubuntu"1" was never uploaded outside of the PPA, right (since it's also marked with 'UNRELEASED')?
  So we could also combine/squash the changelog entries for 0ubuntu1 and 0ubuntu2 to a new 0ubuntu1
  and upload this. - just a thought.
  (It would be a bit cleaner for the archive, but I believe uploading an 0ubuntu2 would also be ok).

The only issue that I found was when I tried to get the orig-tarball, what I usually do using uscan.
But that didn't work, because the watch file seems to be broken:
$ uscan
uscan warn: debian/watch is an obsolete version 1 watch file;
   please upgrade to a higher version
   (see uscan(1) for details).
uscan warn: debian/watch is an obsolete version 1 watch file;
   please upgrade to a higher version
   (see uscan(1) for details).
uscan warn: debian/watch is an obsolete version 1 watch file;
   please upgrade to a higher version
   (see uscan(1) for details).
uscan warn: debian/watch is an obsolete version 1 watch file;
   please upgrade to a higher version
   (see uscan(1) for details).
uscan warn: debian/watch is an obsolete version 1 watch file;
   please upgrade to a higher version
   (see uscan(1) for details).
uscan warn: there appears to be a version 2 format line in
the version 1 watch file debian/watch;
Have you forgotten a 'version=2' line at the start, perhaps?
Skipping the line: Version: 5
uscan warn: there appears to be a version 2 format line in
the version 1 watch file debian/watch;
Have you forgotten a 'version=2' line at the start, perhaps?
Skipping the line: Source: https://api.github.com/repos/ROCm/rocm_smi_lib/tags?per_page=100
uscan warn: there appears to be a version 2 format line in
the version 1 watch file debian/watch;
Have you forgotten a 'version=2' line at the start, perhaps?
Skipping the line: Matching-Pattern: https://api.github.com/repos/ROCm/rocm_smi_lib/tarball/refs/tags/rocm-(?:[-_]?[Vv]?(\d[\-+\.:\~\da-zA-Z]*))
uscan warn: there appears to be a version 2 format line in
the version 1 watch file debian/watch;
Have you forgotten a 'version=2' line at the start, perhaps?
Skipping the line: Filenamemangle: s%.*/rocm-(?:[-_]?[Vv]?(\d[\-+\.:\~\da-zA-Z]*))%rocm-smi-lib-$1.tar.gz%
uscan warn: there appears to be a version 2 format line in
the version 1 watch file debian/watch;
Have you forgotten a 'version=2' line at the start, ...

review: Needs Information

[Frank Heimes (fheimes)]

Good point, the issue with the watch file is likely because it's a v5, and I have tried it on a noble systems (rather than in a resolute container) -- good catch.

[Talha Can Havadar (tchavadar)]

Hello Frank,

Thank you very much for your time, yeah you are absolutely correct on questioning arch changes.

Please see the original content of the debian/control of the package here: https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/debian/unstable/debian/control?ref_type=heads

I believe there was a glitch/bug or whatever in our debian sync bot/tool which caused adding all architectures to this package during import. it probably replaces all `linux-any`s with all archs explicitly.

so I believe it should stay as any.

about 0ubuntu1 yes it was only released in the ppa, I dont think anybody really installed the package from the ppa but it is a public ppa anyways so to not break the update path I would like to keep 0ubuntu2 but do you want me to merge these changelog entries and keep it as 0ubuntu2 and add a comment in the entry to state this?

[Talha Can Havadar (tchavadar)]

For uscan I think v5 only works on questing and above. So I usually use a resolute container or find a newer version of uscan somewhere and use that locally to run v5 watch scripts

[Frank Heimes (fheimes)]

Hi Talha,
thanks for the reference to salsa - looks like it was always linux-any.

Yes, the watch file version is 5, hence it works fine on a resolute system.
(Funnily enough it would not have helped me, since it fetches of course the latest version, which is 7.1.1 - but this is a version bump to 7.0.1.)

No, if you want to stick with 0ubuntu2, I think there is no need for an update and we can go as is.

review: Approve

[Talha Can Havadar (tchavadar)]

Thank you very much Frank!

diff --git a/.azuredevops/rocm-ci.yml b/.azuredevops/rocm-ci.yml
index dcb8198..430c585 100644
--- a/.azuredevops/rocm-ci.yml
+++ b/.azuredevops/rocm-ci.yml
@@ -14,26 +14,28 @@ trigger:
   branches:
     include:
     - amd-staging
+    - amd-mainline
   paths:
     exclude:
     - .github
     - docs
     - '.*.y*ml'
     - '*.md'
-    - License.txt
+    - LICENSE
 
 pr:
   autoCancel: true
   branches:
     include:
     - amd-staging
+    - amd-mainline
   paths:
     exclude:
     - .github
     - docs
     - '.*.y*ml'
     - '*.md'
-    - License.txt
+    - LICENSE
   drafts: false
 
 jobs:
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 50f8b9f..75ee317 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
-* @bill-shuzhou-liu @dmitrii-galantsev @charis-poag-amd @oliveiradan
+* @bill-shuzhou-liu @dmitrii-galantsev @charis-poag-amd @oliveiradan @marifamd @gabrpham
 
 docs/* @ROCm/rocm-documentation
 *.md @ROCm/rocm-documentation
diff --git a/.github/palamida.yml b/.github/palamida.yml
new file mode 100644
index 0000000..47bd57a
--- /dev/null
+++ b/.github/palamida.yml
@@ -0,0 +1,5 @@
+disabled: false
+scmId: gh-emu-rocm
+branchesToScan:
+  - amd-staging
+  - amd-mainline
\ No newline at end of file
diff --git a/.github/workflows/kws-caller.yml b/.github/workflows/kws-caller.yml
new file mode 100644
index 0000000..c0f4f26
--- /dev/null
+++ b/.github/workflows/kws-caller.yml
@@ -0,0 +1,15 @@
+name: Rocm Validation Suite KWS
+on:
+  push:
+    branches: [amd-staging, amd-mainline]
+  pull_request:
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+jobs:
+  kws:
+    if: ${{ github.event_name == 'pull_request' }}
+    uses: AMD-ROCm-Internal/rocm_ci_infra/.github/workflows/kws.yml@mainline
+    secrets: inherit
+    with:
+      pr_number: ${{github.event.pull_request.number}}
+      base_branch: ${{github.base_ref}}
diff --git a/.github/workflows/rocm_ci_caller.yml b/.github/workflows/rocm_ci_caller.yml
index c3a28cc..9643cdf 100644
--- a/.github/workflows/rocm_ci_caller.yml
+++ b/.github/workflows/rocm_ci_caller.yml
@@ -1,19 +1,25 @@
-name: ROCm CI Caller
-on: 
+name: ROCm CI Caller  
+on:  
   pull_request:  
-    branches: [release/rocm-rel-6.4]  
+    branches: [amd-staging, release/rocm-rel-*, amd-mainline]  
     types: [opened, reopened, synchronize]  
+  push:  
+    branches: [amd-mainline]  
   workflow_dispatch:  
+  issue_comment:  
+    types: [created]  
   
 jobs:  
   call-workflow:  
-    uses: AMD-ROCm-Internal/rocm_ci_infra/.github/workflows/rocm_ci.yml@mainline 
+    if: github.event_name != 'issue_comment' ||(github.event_name == 'issue_comment' && github.event.issue.pull_request && (startsWith(github.event.comment.body, '!verify') || startsWith(github.event.comment.body, '!verify release') || startsWith(github.event.comment.body, '!verify retest')))  
+    uses: AMD-ROCm-Internal/rocm_ci_infra/.github/workflows/rocm_ci.yml@mainline
     secrets: inherit  
     with:  
-      input_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}  
-      input_pr_num: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || 0 }}  
-      input_pr_url: ${{ github.event_name == 'pull_request' && github.event.pull_request.html_url || '' }}  
-      input_pr_title: ${{ github.event_name == 'pull_request' && github.event.pull_request.title || '' }}  
+      input_sha: ${{github.event_name == 'pull_request' && github.event.pull_request.head.sha || (github.event_name == 'push' && github.sha) || (github.event_name == 'issue_comment' && github.event.issue.pull_request.head.sha) || github.sha}}  
+      input_pr_num: ${{github.event_name == 'pull_request' && github.event.pull_request.number || (github.event_name == 'issue_comment' && github.event.issue.number) || 0}}  
+      input_pr_url: ${{github.event_name == 'pull_request' && github.event.pull_request.html_url || (github.event_name == 'issue_comment' && github.event.issue.pull_request.html_url) || ''}}  
+      input_pr_title: ${{github.event_name == 'pull_request' && github.event.pull_request.title || (github.event_name == 'issue_comment' && github.event.issue.pull_request.title) || ''}}  
       repository_name: ${{ github.repository }}  
-      base_ref: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref }}  
-      trigger_event_type: ${{ github.event_name }}
+      base_ref: ${{github.event_name == 'pull_request' && github.event.pull_request.base.ref || (github.event_name == 'issue_comment' && github.event.issue.pull_request.base.ref) || github.ref}}  
+      trigger_event_type: ${{ github.event_name }}  
+      comment_text: ${{ github.event_name == 'issue_comment' && github.event.comment.body || '' }} 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 683e654..ab2eac0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,95 @@ Full documentation for rocm_smi_lib is available at [https://rocm.docs.amd.com/]
 
 ***All information listed below is for reference and subject to change.***
 
+## rocm_smi_lib for ROCm 7.0.0
+
+### Added
+
+- **Added support for GPU metrics 1.8**.  
+  - Added new fields for `rsmi_gpu_metrics_t` including:  
+    - Adding the following metrics to allow new calculations for violation status:
+    - Per XCP metrics `gfx_below_host_limit_ppt_acc[XCP][MAX_XCC]` - GFX Clock Host limit Package Power Tracking violation counts
+    - Per XCP metrics `gfx_below_host_limit_thm_acc[XCP][MAX_XCC]` - GFX Clock Host limit Thermal (TVIOL) violation counts
+    - Per XCP metrics `gfx_low_utilization_acc[XCP][MAX_XCC]` - violation counts for how did low utilization caused the GPU to be below application clocks.
+    - Per XCP metrics `gfx_below_host_limit_total_acc[XCP][MAX_XCC]`- violation counts for how long GPU was held below application clocks any limiter (see above new violation metrics).
+  - Increasing available JPEG engines to 40.  
+  Current ASICs may not support all 40. These will be indicated as UINT16_MAX or N/A in CLI.
+
+### Changed
+
+- N/A
+
+### Removed
+
+- **Removed backwards compatibility `rsmi_dev_gpu_metrics_info_get()`'s `jpeg_activity` or `vcn_activity` fields: use `xcp_stats.jpeg_busy` or `xcp_stats.vcn_busy`**  
+  - Backwards compability is removed for `jpeg_activity` and `vcn_activity` fields, if the `jpeg_busy` or `vcn_busy` field is available.
+    - <i>Reasons for this change</i>:
+      - Providing both `vcn_activity`/`jpeg_activity` and XCP (partition) stats `vcn_busy`/`jpeg_busy` caused confusion for users about which field to use. By removing backward compatibility, it is easier to identify the relevant field.
+      - The `jpeg_busy` field increased in size (for supported ASICs), making backward compatibility unable to fully copy the structure into `jpeg_activity`.
+
+    See below for comparison of updated CLI outputs:
+
+    Original output:
+    ```shell
+    $ rocm-smi --showmetrics
+    GPU[0]          : vcn_activity (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0]          : jpeg_activity (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[0]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[1]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[2]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[3]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[4]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[5]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[6]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[7]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[0]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[1]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[2]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[3]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[4]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[5]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[6]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[7]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    ```
+    New output:
+    ```shell
+    $ rocm-smi --showmetrics
+    GPU[0]          : vcn_activity (%): ['N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0]          : jpeg_activity (%): ['N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[0]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[1]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[2]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[3]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[4]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[5]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[6]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[7]   : xcp_stats.jpeg_busy (%): [0, 0, 0, 0, 0, 0, 0, 0, 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[0]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[1]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[2]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[3]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[4]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[5]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[6]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    GPU[0] XCP[7]   : xcp_stats.vcn_busy (%): [0, 'N/A', 'N/A', 'N/A']
+    ```
+
+### Optimized
+
+- N/A
+
+### Resolved issues
+
+- N/A
+
+### Upcoming changes
+
+- N/A
+
+### Known issues
+
+- N/A
+
 ## rocm_smi_lib for ROCm 6.4.1
 
 ### Added
diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755
new mode 100644
index a374078..327cb30
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,15 +5,13 @@ message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 message("                    CMake ROCm SMI (Library) [root]                ")
 message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 cmake_minimum_required(VERSION 3.14)
+project(rocm_smi_lib)
 
 set(ROCM_SMI_LIBS_TARGET "rocm_smi_libraries")
 
 set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared library (.so) or not.")
 
-## Set default module path if not already set
-if(NOT DEFINED CMAKE_MODULE_PATH)
-    set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
-endif()
+list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
 ## Include common cmake modules
 include(utils)
 
@@ -23,7 +21,7 @@ find_package(PkgConfig)
 set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
 
 if (NOT DEFINED CPACK_RESOURCE_FILE_LICENSE)
-    set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt")
+    set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
 endif()
 
 set(ROCM_SMI "rocm_smi")
@@ -41,10 +39,12 @@ set(SHARE_INSTALL_PREFIX
 # provide git to utilities
 find_program (GIT NAMES git)
 
+# sets DRM_INCLUDE_DIRS
+pkg_check_modules(DRM REQUIRED libdrm)
 
 ## Setup the package version based on git tags.
 set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver")
-get_package_version_number("7.6.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
+get_package_version_number("7.8.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
 message("Package version: ${PKG_VERSION_STR}")
 set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}")
 set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}")
@@ -101,7 +101,7 @@ set(CMAKE_CXX_FLAGS
 
 # Clang does not set the build-id
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id=sha1")
+    set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1")
 endif()
 
 # Use this instead of above for 32 bit
@@ -135,10 +135,16 @@ else ()
     set(CMAKE_CXX_FLAGS
       "${CMAKE_CXX_FLAGS} -DFORTIFY_SOURCE=2 -fstack-protector-all -Wcast-align")
     ## More security breach mitigation flags
-    set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -Wl,-z,noexecstack -Wl,-znoexecheap -Wl,-z,relro ")
-    set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -Wtrampolines -Wl,-z,now")
+    set(HARDENING_LDFLAGS
+      "${HARDENING_LDFLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${HARDENING_LDFLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${HARDENING_LDFLAGS}")
+
+    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag("-Wtrampolines" CXX_SUPPORTS_WTRAMPOLINES)
+    if (CXX_SUPPORTS_WTRAMPOLINES)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wtrampolines")
+    endif ()
 endif ()
 
 set(COMMON_SRC_DIR "${PROJECT_SOURCE_DIR}/src")
@@ -197,16 +203,15 @@ set(CPACK_RPM_COMPONENT_INSTALL ON)
 # python doesn't need to be asan
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6, python3")
 set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}")
+set(CPACK_RPM_PACKAGE_REQUIRES "python3")
+set(CPACK_RPM_ASAN_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}")
 # Only add dependency on rocm-core if -DROCM_DEP_ROCMCORE=ON is given
 if(ROCM_DEP_ROCMCORE)
-    set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, rocm-core")
-    # rocm-core needs to be asan
-    # override original variable because CPACK_DEBIAN_PACKAGE_DEPENDS changed
-    set(CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}-asan")
+    string(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ", rocm-core")
+    string(APPEND CPACK_DEBIAN_ASAN_PACKAGE_DEPENDS ", rocm-core-asan")
+    string(APPEND CPACK_RPM_PACKAGE_REQUIRES ", rocm-core")
+    string(APPEND CPACK_RPM_ASAN_PACKAGE_REQUIRES ", rocm-core-asan")
 endif()
-# carefully reuse DEB's "DEPENDS" for RPM's "REQUIRES"
-set(CPACK_RPM_PACKAGE_REQUIRES "python3")
-set(CPACK_RPM_ASAN_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}")
 
 #Component Specific Configuration/Flags
 set(CPACK_DEBIAN_DEV_PACKAGE_NAME ${ROCM_SMI_PACKAGE})
@@ -221,33 +226,12 @@ set(CPACK_RPM_STATIC_PACKAGE_NAME ${ROCM_SMI_PACKAGE}-static-devel)
 add_subdirectory("rocm_smi")
 add_subdirectory("oam")
 
-option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" OFF)
-
 # Add tests
 if(BUILD_TESTS)
     set(TESTS_COMPONENT "tests")
     add_subdirectory("tests/rocm_smi_test")
 endif()
 
-if(FILE_REORG_BACKWARD_COMPATIBILITY)
-# To enable/disable #error in wrapper header files
-  if(NOT DEFINED ROCM_HEADER_WRAPPER_WERROR)
-      if(DEFINED ENV{ROCM_HEADER_WRAPPER_WERROR})
-          set(ROCM_HEADER_WRAPPER_WERROR "$ENV{ROCM_HEADER_WRAPPER_WERROR}"
-                  CACHE STRING "Header wrapper warnings as errors.")
-      else()
-          set(ROCM_HEADER_WRAPPER_WERROR "OFF" CACHE STRING "Header wrapper warnings as errors.")
-      endif()
-  endif()
-  if(ROCM_HEADER_WRAPPER_WERROR)
-      set(deprecated_error 1)
-  else()
-      set(deprecated_error 0)
-  endif()
-
-  include(rocm_smi-backward-compat.cmake)
-endif()
-
 include(CMakePackageConfigHelpers)
 
 set(LIB_INSTALL_DIR  "${CMAKE_INSTALL_LIBDIR}")
@@ -293,14 +277,14 @@ install(EXPORT rocm_smiTargets
 
 #License file
 set(CPACK_RPM_PACKAGE_LICENSE "NCSA")
-# install license file in share/doc/rocm_smi-asan folder
+# install license file in share/doc/rocm-smi-lib-asan folder
 if( ENABLE_ASAN_PACKAGING )
   install(FILES ${CPACK_RESOURCE_FILE_LICENSE}
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/${ROCM_SMI}-asan RENAME LICENSE.txt
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/${ROCM_SMI_PACKAGE}-asan RENAME LICENSE.md
         COMPONENT asan)
 endif()
 install( FILES ${CPACK_RESOURCE_FILE_LICENSE}
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/${ROCM_SMI} RENAME LICENSE.txt
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/${ROCM_SMI_PACKAGE} RENAME LICENSE.md
         COMPONENT dev)
 
 ###########################
diff --git a/License.txt b/LICENSE.md
similarity index 94%
rename from License.txt
rename to LICENSE.md
index 31f9503..4d43ac8 100644
--- a/License.txt
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023-2024, Advanced Micro Devices, Inc. All rights reserved.
+Copyright (C) Advanced Micro Devices, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index 13a593a..5ef16eb
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # 🛠️ Maintenance Mode Notice 🛠️
 
-Starting with ROCm 6.5, only critical bug fixes will be applied to ROCm-SMI.
+Starting with ROCm 7.0, only critical bug fixes will be applied to ROCm-SMI.
 For a seamless experience and continued support, please switch to [AMD-SMI](https://github.com/ROCm/amdsmi).
 
 ## Use C++ in ROCm SMI
diff --git a/cmake_modules/help_package.cmake b/cmake_modules/help_package.cmake
index 94f71ce..9bfb07e 100644
--- a/cmake_modules/help_package.cmake
+++ b/cmake_modules/help_package.cmake
@@ -85,7 +85,7 @@ function(generic_package)
         "${CMAKE_INSTALL_PREFIX}"
         CACHE STRING "Default packaging prefix.")
     set(CPACK_RESOURCE_FILE_LICENSE
-        "${CMAKE_CURRENT_SOURCE_DIR}/License.txt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md"
         CACHE STRING "")
     set(CPACK_RPM_PACKAGE_LICENSE
         "MIT"
diff --git a/cmake_modules/utils.cmake b/cmake_modules/utils.cmake
old mode 100755
new mode 100644
index 7131761..77aadee
--- a/cmake_modules/utils.cmake
+++ b/cmake_modules/utils.cmake
@@ -3,7 +3,7 @@
 ## The University of Illinois/NCSA
 ## Open Source License (NCSA)
 ##
-## Copyright (c) 2014-2017, Advanced Micro Devices, Inc. All rights reserved.
+## Copyright (c) 2014-2025, Advanced Micro Devices, Inc. All rights reserved.
 ##
 ## Developed by:
 ##
diff --git a/debian/changelog b/debian/changelog
index 41c6f20..09f56d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+rocm-smi-lib (7.1.0-0ubuntu2) resolute; urgency=medium
+
+  [ Talha Can Havadar ]
+  * New upstream version 7.1.0 (LP: #2138653)
+  * d/p/0002-add-version-script-to-control-exposed-symbols.patch:
+    Fix FTBFS, error bad value for '-march=' switch
+
+  [ Gennaro Oliva ]
+  * d/control: add missing libdrm-dev for librocm-smi-lib (Closes: #1121159)
+
+ -- Talha Can Havadar <[e-mail]>  Fri, 19 Dec 2025 08:45:45 +0100
+
+rocm-smi-lib (7.1.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Igor Luppi ]
+  * d/{control,liboam1*,librocm-smi64-1*}: Update SOVERSION from 1 to 7
+  * d/p/0002-add-version-script-to-control-exposed-symbols.patch: fix soversion
+  * d/rules: fix soversion
+
+  [ Zhai Zhaoxuan ]
+  * d/control: add pkg-config in build-depends
+  * d/not-installed: update the name of duplicated LICENSE file
+
+  [ Talha Can Havadar ]
+  * d/rules: make symbol checking strict for builds
+  * d/patches: fix so version problem due to missing git
+
+ -- Igor Luppi <[e-mail]>  Wed, 17 Dec 2025 16:21:06 -0300
+
+rocm-smi-lib (6.4.3-0ubuntu1) questing; urgency=medium
+
+  * New upstream version 6.4.3
+  * d/control: update maintainer information
+
+ -- Igor Luppi <[e-mail]>  Mon, 22 Sep 2025 15:52:03 -0300
+
 rocm-smi-lib (6.4.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index b3d0850..eba2d34 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: rocm-smi-lib
-Maintainer: Debian ROCm Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian ROCm Team <[e-mail]>
 Uploaders: Mo Zhou <[e-mail]>,
            Étienne Mollier <[e-mail]>,
            Xuanteng Huang <[e-mail]>,
@@ -9,6 +10,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                cmake,
                libdrm-dev,
+               pkgconf,
 Standards-Version: 4.7.2
 Vcs-Browser: https://salsa.debian.org/rocm-team/rocm-smi-lib
 Vcs-Git: https://salsa.debian.org/rocm-team/rocm-smi-lib.git
@@ -19,12 +21,12 @@ Architecture: linux-any
 Section: utils
 Depends: ${misc:Depends},
          python3:any,
-         librocm-smi64-1 (= ${binary:Version})
+         librocm-smi64-7 (= ${binary:Version})
 Description: ROCm System Management Interface (ROCm SMI) command-line interface
  This is the reference implementation from AMD, exposing the ROCm SMI library
  to the user. It presents a Python executable, `rocm-smi`.
 
-Package: librocm-smi64-1
+Package: librocm-smi64-7
 Architecture: linux-any
 Section: libs
 Depends: ${misc:Depends},
@@ -39,9 +41,9 @@ Package: librocm-smi-dev
 Architecture: linux-any
 Section: libdevel
 Depends: ${misc:Depends},
-         librocm-smi64-1 (= ${binary:Version}),
          liboam-dev (= ${binary:Version}),
          libdrm-dev,
+         librocm-smi64-7 (= ${binary:Version})
 Description: ROCm System Management Interface (ROCm SMI) library headers
  ROCm SMI is part of the ROCm software stack. It is a C library for Linux
  that provides a user-space interface for applications to monitor and
@@ -49,7 +51,7 @@ Description: ROCm System Management Interface (ROCm SMI) library headers
  .
  This package contains the development headers.
 
-Package: liboam1
+Package: liboam7
 Architecture: linux-any
 Section: libs
 Depends: ${misc:Depends},
@@ -64,7 +66,7 @@ Package: liboam-dev
 Architecture: linux-any
 Section: libdevel
 Depends: ${misc:Depends},
-         liboam1 (= ${binary:Version})
+         liboam7 (= ${binary:Version})
 Description: Datacenter flavor of a GPU system-management API headers
  OCP Accelerator Module (OAM), is an Open Compute Project (OCP) hardware
  standard, used in datacenters and high-performance-computing (HPC) clusters.
diff --git a/debian/liboam1.install b/debian/liboam1.install
deleted file mode 100644
index d2ebc4e..0000000
--- a/debian/liboam1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/liboam.so.1 usr/lib/${DEB_HOST_MULTIARCH}/
-usr/lib/${DEB_HOST_MULTIARCH}/liboam.so.1.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/liboam7.install b/debian/liboam7.install
new file mode 100644
index 0000000..9c6ccd3
--- /dev/null
+++ b/debian/liboam7.install
@@ -0,0 +1,2 @@
+usr/lib/${DEB_HOST_MULTIARCH}/liboam.so.7 usr/lib/${DEB_HOST_MULTIARCH}/
+usr/lib/${DEB_HOST_MULTIARCH}/liboam.so.7.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/liboam1.symbols.amd64 b/debian/liboam7.symbols.amd64
similarity index 99%
rename from debian/liboam1.symbols.amd64
rename to debian/liboam7.symbols.amd64
index 08d444b..9348cc4 100644
--- a/debian/liboam1.symbols.amd64
+++ b/debian/liboam7.symbols.amd64
@@ -1,4 +1,4 @@
-liboam.so.1 liboam1 #MINVER#
+liboam.so.7 liboam7 #MINVER#
 * Build-Depends-Package: liboam-dev
  amdoam_discover_devices@Base 4.5.2
  amdoam_free@Base 4.5.2
diff --git a/debian/librocm-smi64-1.install b/debian/librocm-smi64-1.install
deleted file mode 100644
index 9ea6b8c..0000000
--- a/debian/librocm-smi64-1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/librocm_smi64.so.1 usr/lib/${DEB_HOST_MULTIARCH}/
-usr/lib/${DEB_HOST_MULTIARCH}/librocm_smi64.so.1.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/librocm-smi64-7.install b/debian/librocm-smi64-7.install
new file mode 100644
index 0000000..13c97fe
--- /dev/null
+++ b/debian/librocm-smi64-7.install
@@ -0,0 +1,2 @@
+usr/lib/${DEB_HOST_MULTIARCH}/librocm_smi64.so.7 usr/lib/${DEB_HOST_MULTIARCH}/
+usr/lib/${DEB_HOST_MULTIARCH}/librocm_smi64.so.7.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/librocm-smi64-1.symbols.amd64 b/debian/librocm-smi64-7.symbols.amd64
similarity index 99%
rename from debian/librocm-smi64-1.symbols.amd64
rename to debian/librocm-smi64-7.symbols.amd64
index 4de3a4d..77834e3 100644
--- a/debian/librocm-smi64-1.symbols.amd64
+++ b/debian/librocm-smi64-7.symbols.amd64
@@ -1,4 +1,4 @@
-librocm_smi64.so.1 librocm-smi64-1 #MINVER#
+librocm_smi64.so.7 librocm-smi64-7 #MINVER#
 * Build-Depends-Package: librocm-smi64-dev
  devInfoTypesStrings@Base 6.1.2
  logFileName@Base 6.1.2
diff --git a/debian/librocm-smi64-1.version b/debian/librocm-smi64-7.version
similarity index 100%
rename from debian/librocm-smi64-1.version
rename to debian/librocm-smi64-7.version
diff --git a/debian/not-installed b/debian/not-installed
index 1ad2705..d87845d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -2,4 +2,4 @@
 usr/oam/*
 usr/rocm_smi/*
 # duplicate license file
-usr/share/doc/rocm_smi/LICENSE.txt
+usr/share/doc/rocm-smi-lib/LICENSE.md
diff --git a/debian/patches/0002-add-version-script-to-control-exposed-symbols.patch b/debian/patches/0002-add-version-script-to-control-exposed-symbols.patch
index 4e9e6af..f21bf27 100644
--- a/debian/patches/0002-add-version-script-to-control-exposed-symbols.patch
+++ b/debian/patches/0002-add-version-script-to-control-exposed-symbols.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0 -DDEBUG")
  endif ()
  
-+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/debian/librocm-smi64-1.version")
++set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/debian/librocm-smi64-7.version")
 +
  ## Address Sanitize Flag
  if (${ADDRESS_SANITIZER})
diff --git a/debian/patches/0005-oam-rocm_smi-fix-version-string-issue-when-no-git-av.patch b/debian/patches/0005-oam-rocm_smi-fix-version-string-issue-when-no-git-av.patch
new file mode 100644
index 0000000..4a54a1c
--- /dev/null
+++ b/debian/patches/0005-oam-rocm_smi-fix-version-string-issue-when-no-git-av.patch
@@ -0,0 +1,45 @@
+From: Talha Can Havadar <[e-mail]>
+Date: Wed, 17 Dec 2025 18:14:30 +0100
+Subject: oam: rocm_smi: fix version string issue when no git available
+
+Git is not available in some build environment and this makes SO version
+to default to 1 which is not correct. In such cases we can fallback to
+CPACK version that is already set correctly.
+
+Bug: https://github.com/ROCm/rocm-systems/pull/2361
+---
+ oam/CMakeLists.txt      | 4 ++--
+ rocm_smi/CMakeLists.txt | 5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/oam/CMakeLists.txt b/oam/CMakeLists.txt
+index 7aa1b5f..c74523e 100644
+--- a/oam/CMakeLists.txt
++++ b/oam/CMakeLists.txt
+@@ -36,8 +36,8 @@ set(SO_VERSION_GIT_TAG_PREFIX "oam_so_ver")
+ message("Package version: ${PKG_VERSION_STR}")
+ 
+ # Debian package specific variables
+-# Set a default value for the package version
+-get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
++# Set a default value for the package version - use the main package version as fallback
++get_version_from_tag("${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
+ 
+ # VERSION_* variables should be set by get_version_from_tag
+ if ( ${ROCM_PATCH_VERSION} )
+diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt
+index 68c90ec..39c8848 100644
+--- a/rocm_smi/CMakeLists.txt
++++ b/rocm_smi/CMakeLists.txt
+@@ -38,8 +38,9 @@ set(SO_VERSION_GIT_TAG_PREFIX "rsmi_so_ver")
+ message("Package version: ${PKG_VERSION_STR}")
+ 
+ # Debian package specific variables
+-# Set a default value for the package version
+-get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
++# Set a default value for the package version - use the main package version as fallback
++get_version_from_tag("${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
++
+ 
+ # VERSION_* variables should be set by get_version_from_tag
+ if ( ${ROCM_PATCH_VERSION} )
diff --git a/debian/patches/series b/debian/patches/series
index 7b38bbb..be3307d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0002-add-version-script-to-control-exposed-symbols.patch
 0003-remove-example-target-using-internal-apis.patch
 0004-revert-remove-reset-partition.patch
+0005-oam-rocm_smi-fix-version-string-issue-when-no-git-av.patch
diff --git a/debian/rules b/debian/rules
index 1c468a9..ceeaa2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 execute_before_dh_missing-indep:
 	rm -vf $(CURDIR)/debian/tmp/usr/bin/rocm_smi.py
+
+# see https://manpages.debian.org/testing/debhelper/dh_makeshlibs.1.en.html
+# and https://manpages.debian.org/testing/dpkg-dev/dpkg-gensymbols.1.en.html
+# To make sure gensymbols fails the build, -c4 to be more strict
+override_dh_makeshlibs:
+	dh_makeshlibs -V -plibrocm-smi64-7 -- -c4
+	dh_makeshlibs -V -pliboam7 -- -c4
diff --git a/docs/conf.py b/docs/conf.py
old mode 100755
new mode 100644
index cfd8d87..cba57b5
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@ shutil.copy2('../CHANGELOG.md','./CHANGELOG.md')
 # for PDF output on Read the Docs
 project = "ROCm SMI LIB Documentation"
 author = "Advanced Micro Devices, Inc."
-copyright = "Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved."
+copyright = "Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved."
 version = version_number
 release = version_number
 
diff --git a/docs/index.rst b/docs/index.rst
old mode 100755
new mode 100644
diff --git a/docs/license.md b/docs/license.md
index 234cd49..aaf95ff 100644
--- a/docs/license.md
+++ b/docs/license.md
@@ -1,4 +1,4 @@
 # License
 
-```{include} ../License.txt
+```{include} ../LICENSE.md
 ```
diff --git a/include/rocm_smi/kfd_ioctl.h b/include/rocm_smi/kfd_ioctl.h
old mode 100755
new mode 100644
diff --git a/include/rocm_smi/rocm_smi.h b/include/rocm_smi/rocm_smi.h
old mode 100755
new mode 100644
index aa9ea97..933b35a
--- a/include/rocm_smi/rocm_smi.h
+++ b/include/rocm_smi/rocm_smi.h
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2017-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
@@ -522,9 +522,10 @@ typedef enum {
 typedef enum {
   RSMI_VOLT_TYPE_FIRST = 0,
 
-  RSMI_VOLT_TYPE_VDDGFX = RSMI_VOLT_TYPE_FIRST,  //!< Vddgfx GPU
-                                                 //!< voltage
-  RSMI_VOLT_TYPE_LAST = RSMI_VOLT_TYPE_VDDGFX,
+  RSMI_VOLT_TYPE_VDDGFX = RSMI_VOLT_TYPE_FIRST,  //!< Vddgfx GPU voltage
+  RSMI_VOLT_TYPE_VDDBOARD,                       //!< Voltage for VDDBOARD
+
+  RSMI_VOLT_TYPE_LAST = RSMI_VOLT_TYPE_VDDBOARD,
   RSMI_VOLT_TYPE_INVALID = 0xFFFFFFFF            //!< Invalid type
 } rsmi_voltage_type_t;
 
@@ -957,6 +958,11 @@ typedef struct metrics_table_header_t metrics_table_header_t;
 #define RSMI_MAX_NUM_JPEG_ENGS 32
 
 /**
+ * @brief This should match kRSMI_MAX_NUM_JPEG_ENG_V1
+ */
+#define RSMI_MAX_NUM_JPEG_ENG_V1 40
+
+/**
  * @brief This should match kRSMI_MAX_NUM_CLKS
  */
 #define RSMI_MAX_NUM_CLKS 4
@@ -1003,7 +1009,7 @@ struct amdgpu_xcp_metrics_t {
   */
   /* Utilization Instantaneous (%) */
   uint32_t gfx_busy_inst[RSMI_MAX_NUM_XCC];
-  uint16_t jpeg_busy[RSMI_MAX_NUM_JPEG_ENGS];
+  uint16_t jpeg_busy[RSMI_MAX_NUM_JPEG_ENG_V1];
   uint16_t vcn_busy[RSMI_MAX_NUM_VCNS];
 
   /* Utilization Accumulated (%) */
@@ -1014,6 +1020,14 @@ struct amdgpu_xcp_metrics_t {
   */
   /* Total App Clock Counter Accumulated */
   uint64_t gfx_below_host_limit_acc[RSMI_MAX_NUM_XCC];
+
+  /**
+   * v1.8 additions
+   */
+  uint64_t gfx_below_host_limit_ppt_acc[RSMI_MAX_NUM_XCC];
+  uint64_t gfx_below_host_limit_thm_acc[RSMI_MAX_NUM_XCC];
+  uint64_t gfx_low_utilization_acc[RSMI_MAX_NUM_XCC];
+  uint64_t gfx_below_host_limit_total_acc[RSMI_MAX_NUM_XCC];
 };
 
 typedef struct {
@@ -1220,7 +1234,7 @@ typedef struct {
   /*
   * v1.7 additions
   */
-  /* VRAM max bandwidth at max memory clock (GB/s) */
+  /* VRAM max bandwidth at max memory clock */
   uint64_t vram_max_bandwidth;
 
   /* XGMI link status(up/down) */
@@ -1367,8 +1381,8 @@ rsmi_status_t rsmi_num_monitor_devices(uint32_t *num_devices);
  *  @brief Get the device id associated with the device with provided device
  *  index.
  *
- *  @details Given a device index @p dv_ind and a pointer to a uint32_t @p id,
- *  this function will write the device id value to the uint64_t pointed to by
+ *  @details Given a device index @p dv_ind and a pointer to a uint16_t @p id,
+ *  this function will write the device id value to the uint16_t pointed to by
  *  @p id. This ID is an identification of the type of device, so calling this
  *  function for different devices will give the same value if they are kind
  *  of device. Consequently, this function should not be used to distinguish
@@ -1377,7 +1391,7 @@ rsmi_status_t rsmi_num_monitor_devices(uint32_t *num_devices);
  *
  *  @param[in] dv_ind a device index
  *
- *  @param[inout] id a pointer to uint64_t to which the device id will be
+ *  @param[inout] id a pointer to uint16_t to which the device id will be
  *  written
  * If this parameter is nullptr, this function will return
  * ::RSMI_STATUS_INVALID_ARGS if the function is supported with the provided,
@@ -1395,12 +1409,12 @@ rsmi_status_t rsmi_dev_id_get(uint32_t dv_ind, uint16_t *id);
 /**
  *  @brief Get the device revision associated with the device
  *
- *  @details Given a device index @p dv_ind and a pointer to a uint32_t to
+ *  @details Given a device index @p dv_ind and a pointer to a uint16_t to
  *  which the revision will be written
  *
  *  @param[in] dv_ind a device index
  *
- *  @param[inout] revision a pointer to uint32_t to which the device revision
+ *  @param[inout] revision a pointer to uint16_t to which the device revision
  *  will be written
  *
  *  @retval ::RSMI_STATUS_SUCCESS is returned upon successful call.
@@ -1412,14 +1426,14 @@ rsmi_status_t rsmi_dev_revision_get(uint32_t dv_ind, uint16_t *revision);
  *  @brief Get the SKU for a desired device associated with the device with
  *  provided device index.
  *
- *  @details Given a device index @p dv_ind and a pointer to a char @p sku,
+ *  @details Given a device index @p dv_ind and a pointer to a uint16_t @p sku,
  *  this function will attempt to obtain the SKU from the Product Information
  *  FRU chip, present on server ASICs. It will write the sku value to the
- *  char array pointed to by @p sku.
+ *  uint16_t pointed to by @p sku.
  *
  *  @param[in] dv_ind a device index
  *
- *  @param[inout] sku a pointer to char to which the sku will be written
+ *  @param[inout] sku a pointer to uint16_t to which the sku will be written
  *
  *  If this parameter is nullptr, this function will return
  *  ::RSMI_STATUS_INVALID_ARGS if the function is supported with the provided,
@@ -1438,13 +1452,13 @@ rsmi_status_t rsmi_dev_sku_get(uint32_t dv_ind, uint16_t *sku);
  *  @brief Get the device vendor id associated with the device with provided
  *  device index.
  *
- *  @details Given a device index @p dv_ind and a pointer to a uint32_t @p id,
- *  this function will write the device vendor id value to the uint64_t pointed
+ *  @details Given a device index @p dv_ind and a pointer to a uint16_t @p id,
+ *  this function will write the device vendor id value to the uint16_t pointed
  *  to by @p id.
  *
  *  @param[in] dv_ind a device index
  *
- *  @param[inout] id a pointer to uint64_t to which the device vendor id will
+ *  @param[inout] id a pointer to uint16_t to which the device vendor id will
  *  be written
  *  If this parameter is nullptr, this function will return
  *  ::RSMI_STATUS_INVALID_ARGS if the function is supported with the provided,
@@ -2962,7 +2976,9 @@ rsmi_status_t rsmi_dev_gpu_reset(uint32_t dv_ind);
  *  If this parameter is nullptr, this function will return
  *  ::RSMI_STATUS_INVALID_ARGS if the function is supported with the provided,
  *  arguments and ::RSMI_STATUS_NOT_SUPPORTED if it is not supported with the
- *  provided arguments.
+ *  provided arguments. In the event where there are some values are missing from
+ *  or not available on the device, the respective values will be set to
+ *  UINT64_MAX.
  *
  *  @retval ::RSMI_STATUS_SUCCESS call was successful
  *  @retval ::RSMI_STATUS_NOT_SUPPORTED installed software or hardware does not
diff --git a/include/rocm_smi/rocm_smi_common.h b/include/rocm_smi/rocm_smi_common.h
old mode 100755
new mode 100644
index 618d1d6..67264f6
--- a/include/rocm_smi/rocm_smi_common.h
+++ b/include/rocm_smi/rocm_smi_common.h
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2018-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2018-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_counters.h b/include/rocm_smi/rocm_smi_counters.h
old mode 100755
new mode 100644
index 091c89d..1447df6
--- a/include/rocm_smi/rocm_smi_counters.h
+++ b/include/rocm_smi/rocm_smi_counters.h
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2019, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_device.h b/include/rocm_smi/rocm_smi_device.h
old mode 100755
new mode 100644
index a891a66..d00d037
--- a/include/rocm_smi/rocm_smi_device.h
+++ b/include/rocm_smi/rocm_smi_device.h
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2017-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_exception.h b/include/rocm_smi/rocm_smi_exception.h
old mode 100755
new mode 100644
index 7c898fb..70e4949
--- a/include/rocm_smi/rocm_smi_exception.h
+++ b/include/rocm_smi/rocm_smi_exception.h
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2018, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_gpu_metrics.h b/include/rocm_smi/rocm_smi_gpu_metrics.h
index 5712ea4..d9325cf 100644
--- a/include/rocm_smi/rocm_smi_gpu_metrics.h
+++ b/include/rocm_smi/rocm_smi_gpu_metrics.h
@@ -1,44 +1,23 @@
 /*
- * =============================================================================
- * The University of Illinois/NCSA
- * Open Source License (NCSA)
- *
- * Copyright (c) 2017-2024, Advanced Micro Devices, Inc.
- * All rights reserved.
- *
- * Developed by:
- *
- *                 AMD Research and AMD ROC Software Development
- *
- *                 Advanced Micro Devices, Inc.
- *
- *                 www.amd.com
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal with the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  - Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimers.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimers in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the names of <Name of Development Group, Name of Institution>,
- *    nor the names of its contributors may be used to endorse or promote
- *    products derived from this Software without specific prior written
- *    permission.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS WITH THE SOFTWARE.
- *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #ifndef ROCM_SMI_ROCM_SMI_GPU_METRICS_H_
@@ -52,9 +31,12 @@
 #include <cassert>
 #include <cstdint>
 #include <cstring>
+#include <iostream>
 #include <string>
 #include <map>
 #include <memory>
+#include <mutex>
+#include <thread>
 #include <type_traits>
 #include <tuple>
 #include <variant>
@@ -72,10 +54,11 @@ constexpr uint32_t kRSMI_GPU_METRICS_API_CONTENT_MINOR_VER_1 = 1;
 constexpr uint32_t kRSMI_GPU_METRICS_API_CONTENT_MINOR_VER_2 = 2;
 constexpr uint32_t kRSMI_GPU_METRICS_API_CONTENT_MINOR_VER_3 = 3;
 constexpr uint32_t kRSMI_GPU_METRICS_API_CONTENT_MINOR_VER_4 = 4;
+constexpr uint32_t kRSMI_GPU_METRICS_API_CONTENT_MINOR_VER_8 = 8;
 constexpr uint32_t kRSMI_LATEST_GPU_METRICS_API_CONTENT_MAJOR_VER
                     = kRSMI_GPU_METRICS_API_CONTENT_MAJOR_VER_1;
-constexpr uint32_t kRSMI_LATEST_GPU_METRICS_API_CONTENT_MINON_VER
-                    = kRSMI_GPU_METRICS_API_CONTENT_MINOR_VER_4;
+constexpr uint32_t kRSMI_LATEST_GPU_METRICS_API_CONTENT_MINOR_VER
+                    = kRSMI_GPU_METRICS_API_CONTENT_MINOR_VER_8;
 
 
 //  Note: This *must* match NUM_HBM_INSTANCES
@@ -96,6 +79,10 @@ constexpr uint32_t kRSMI_MAX_NUM_VCNS = 4;
 //  Note: This *must* match NUM_JPEG_ENG
 constexpr uint32_t kRSMI_MAX_JPEG_ENGINES = 32;
 
+//  Note: Updated for amdgpu_xcp_metrics_v1_2.
+//  Document provides NUM_JPEG_ENG_V1 but will rename to kRSMI_MAX_NUM_JPEG_ENG_V1
+constexpr uint32_t kRSMI_MAX_NUM_JPEG_ENG_V1 = 40;
+
 //  Note: This *must* match MAX_XCC
 constexpr uint32_t kRSMI_MAX_NUM_XCC = 8;
 
@@ -108,6 +95,15 @@ struct AMDGpuMetricsHeader_v1_t {
   uint8_t  m_format_revision;
   uint8_t  m_content_revision;
 };
+struct amdgpu_xcp_metrics {
+  /* Utilization Instantaneous (%) */
+  uint32_t gfx_busy_inst[kRSMI_MAX_NUM_XCC];
+  uint16_t jpeg_busy[kRSMI_MAX_JPEG_ENGINES];
+  uint16_t vcn_busy[kRSMI_MAX_NUM_VCNS];
+
+  /* Utilization Accumulated (%) */
+  uint64_t gfx_busy_acc[kRSMI_MAX_NUM_XCC];
+};
 
 struct amdgpu_xcp_metrics_v1_1 {
   /* Utilization Instantaneous (%) */
@@ -122,14 +118,21 @@ struct amdgpu_xcp_metrics_v1_1 {
   uint64_t gfx_below_host_limit_acc[kRSMI_MAX_NUM_XCC];
 };
 
-struct amdgpu_xcp_metrics {
+/* new for gpu metrics v1.8 */
+struct amdgpu_xcp_metrics_v1_2 {
   /* Utilization Instantaneous (%) */
   uint32_t gfx_busy_inst[kRSMI_MAX_NUM_XCC];
-  uint16_t jpeg_busy[kRSMI_MAX_JPEG_ENGINES];
+  uint16_t jpeg_busy[kRSMI_MAX_NUM_JPEG_ENG_V1];
   uint16_t vcn_busy[kRSMI_MAX_NUM_VCNS];
 
   /* Utilization Accumulated (%) */
   uint64_t gfx_busy_acc[kRSMI_MAX_NUM_XCC];
+
+  /* Total App Clock Counter Accumulated */
+  uint64_t gfx_below_host_limit_ppt_acc[kRSMI_MAX_NUM_XCC];
+  uint64_t gfx_below_host_limit_thm_acc[kRSMI_MAX_NUM_XCC];
+  uint64_t gfx_low_utilization_acc[kRSMI_MAX_NUM_XCC];
+  uint64_t gfx_below_host_limit_total_acc[kRSMI_MAX_NUM_XCC];
 };
 
 struct AMDGpuMetricsBase_t {
@@ -602,7 +605,7 @@ struct AMDGpuMetrics_v17_t {
   uint16_t m_average_gfx_activity;
   uint16_t m_average_umc_activity;  // memory controller
 
-  /* VRAM max bandwidth at max memory clock */
+  /* VRAM max bandwidth at max memory clock (GB/s) */
   uint64_t m_vram_max_bandwidth;  // new for 1.7
 
   /* Energy (15.259uJ (2^-16) units) */
@@ -685,7 +688,107 @@ struct AMDGpuMetrics_v17_t {
   /* PCIE other end recovery counter */
   uint32_t m_pcie_lc_perf_other_end_recovery;
 };
-using AMGpuMetricsLatest_t = AMDGpuMetrics_v17_t;
+
+struct AMDGpuMetrics_v18_t {
+  ~AMDGpuMetrics_v18_t() = default;
+  struct AMDGpuMetricsHeader_v1_t m_common_header;
+
+  /* Temperature (Celsius) */
+  uint16_t m_temperature_hotspot;
+  uint16_t m_temperature_mem;
+  uint16_t m_temperature_vrsoc;
+
+  /* Power (Watts) */
+  uint16_t m_current_socket_power;
+
+  /* Utilization (%) */
+  uint16_t m_average_gfx_activity;
+  uint16_t m_average_umc_activity;  // memory controller
+
+  /* VRAM max bandwidthi (in GB/sec) at max memory clock */
+  uint64_t m_mem_max_bandwidth;
+
+  /* Energy (15.259uJ (2^-16) units) */
+  uint64_t m_energy_accumulator;
+
+  /* Driver attached timestamp (in ns) */
+  uint64_t m_system_clock_counter;
+
+  /* Accumulation cycle counter */
+  uint32_t m_accumulation_counter;
+
+  /* Accumulated throttler residencies */
+  uint32_t m_prochot_residency_acc;
+  uint32_t m_ppt_residency_acc;
+  uint32_t m_socket_thm_residency_acc;
+  uint32_t m_vr_thm_residency_acc;
+  uint32_t m_hbm_thm_residency_acc;
+
+  /* Clock Lock Status. Each bit corresponds to clock instance */
+  uint32_t m_gfxclk_lock_status;
+
+  /* Link width (number of lanes) and speed (in 0.1 GT/s) */
+  uint16_t m_pcie_link_width;
+  uint16_t m_pcie_link_speed;
+
+  /* XGMI bus width and bitrate (in Gbps) */
+  uint16_t m_xgmi_link_width;
+  uint16_t m_xgmi_link_speed;
+
+  /* Utilization Accumulated (%) */
+  uint32_t m_gfx_activity_acc;
+  uint32_t m_mem_activity_acc;
+
+  /*PCIE accumulated bandwidth (GB/sec) */
+  uint64_t m_pcie_bandwidth_acc;
+
+  /*PCIE instantaneous bandwidth (GB/sec) */
+  uint64_t m_pcie_bandwidth_inst;
+
+  /* PCIE L0 to recovery state transition accumulated count */
+  uint64_t m_pcie_l0_to_recov_count_acc;
+
+  /* PCIE replay accumulated count */
+  uint64_t m_pcie_replay_count_acc;
+
+  /* PCIE replay rollover accumulated count */
+  uint64_t m_pcie_replay_rover_count_acc;
+
+  /* PCIE NAK sent  accumulated count */
+  uint32_t m_pcie_nak_sent_count_acc;
+
+  /* PCIE NAK received accumulated count */
+  uint32_t m_pcie_nak_rcvd_count_acc;
+
+  /* XGMI accumulated data transfer size(KiloBytes) */
+  uint64_t m_xgmi_read_data_acc[kRSMI_MAX_NUM_XGMI_LINKS];
+  uint64_t m_xgmi_write_data_acc[kRSMI_MAX_NUM_XGMI_LINKS];
+
+  /* XGMI link status(active/inactive) */
+  uint16_t m_xgmi_link_status[kRSMI_MAX_NUM_XGMI_LINKS];
+
+  uint16_t m_padding;
+
+  /* PMFW attached timestamp (10ns resolution) */
+  uint64_t m_firmware_timestamp;
+
+  /* Current clocks (Mhz) */
+  uint16_t m_current_gfxclk[kRSMI_MAX_NUM_GFX_CLKS];
+  uint16_t m_current_socclk[kRSMI_MAX_NUM_CLKS];
+  uint16_t m_current_vclk0[kRSMI_MAX_NUM_CLKS];
+  uint16_t m_current_dclk0[kRSMI_MAX_NUM_CLKS];
+  uint16_t m_current_uclk;
+
+  /* Number of current partition */
+  uint16_t m_num_partition;
+
+  /* XCP metrics stats */
+  struct amdgpu_xcp_metrics_v1_2 m_xcp_stats[kRSMI_MAX_NUM_XCP];
+
+  /* PCIE other end recovery counter */
+  uint32_t m_pcie_lc_perf_other_end_recovery;
+};
+using AMGpuMetricsLatest_t = AMDGpuMetrics_v18_t;
 
 /**
  *  This is GPU Metrics version that gets to public access.
@@ -900,11 +1003,18 @@ enum class AMDGpuMetricsUnitType_t : AMDGpuMetricTypeId_t
   kMetricJpegBusy,                           // v1.6
   kMetricVcnBusy,                            // v1.6
   kMetricGfxBusyAcc,                         // v1.6
+  kMetricGfxBelowHostLimitAccumulator,       // v1.7
+
   kMetricPcieLCPerfOtherEndRecov,            // v1.6
 
   kMetricVramMaxBandwidth,                   // v1.7
   kMetricXgmiLinkStatus,                     // v1.7
-  kMetricGfxBelowHostLimitAccumulator,       // v1.7
+
+  kMetricGfxBelowHostLimitPptAcc,            // v1.8
+  kMetricGfxBelowHostLimitThmAcc,            // v1.8
+  kMetricGfxBelowHostLimitTotalAcc,          // v1.8
+  kMetricGfxLowUtilitizationAcc,             // v1.8
+
 };
 using AMDGpuMetricsUnitTypeTranslationTbl_t = std::map<AMDGpuMetricsUnitType_t, std::string>;
 
@@ -943,6 +1053,7 @@ enum class AMDGpuMetricVersionFlags_t : AMDGpuMetricVersionFlagId_t
   kGpuMetricV15 = (0x1 << 5),
   kGpuMetricV16 = (0x1 << 6),
   kGpuMetricV17 = (0x1 << 7),
+  kGpuMetricV18 = (0x1 << 8),  // Added new version flag
 };
 using AMDGpuMetricVersionTranslationTbl_t = std::map<uint16_t, AMDGpuMetricVersionFlags_t>;
 using GpuMetricTypePtr_t = std::shared_ptr<void>;
@@ -952,27 +1063,24 @@ class GpuMetricsBase_t {
     virtual ~GpuMetricsBase_t() = default;
     virtual size_t sizeof_metric_table() = 0;
     virtual GpuMetricTypePtr_t get_metrics_table() = 0;
-    virtual void dump_internal_metrics_table() = 0;
     virtual AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() = 0;
     virtual rsmi_status_t populate_metrics_dynamic_tbl() = 0;
     virtual AMGpuMetricsPublicLatestTupl_t copy_internal_to_external_metrics() = 0;
     virtual void set_device_id(uint32_t device_id) { m_device_id = device_id; }
     virtual void set_partition_id(uint32_t partition_id) { m_partition_id = partition_id; }
     virtual AMDGpuDynamicMetricsTbl_t get_metrics_dynamic_tbl() {
-      return m_metrics_dynamic_tbl;
+      return m_base_metrics_dynamic_tbl;
     }
 
  protected:
-    AMDGpuDynamicMetricsTbl_t m_metrics_dynamic_tbl;
+    AMDGpuDynamicMetricsTbl_t m_base_metrics_dynamic_tbl;
     uint64_t m_metrics_timestamp;
     uint32_t m_device_id;
     uint32_t m_partition_id;
-
 };
 using GpuMetricsBasePtr = std::shared_ptr<GpuMetricsBase_t>;
 using AMDGpuMetricFactories_t = const std::map<AMDGpuMetricVersionFlags_t, GpuMetricsBasePtr>;
 
-
 class GpuMetricsBase_v11_t final : public GpuMetricsBase_t {
  public:
     virtual ~GpuMetricsBase_v11_t() = default;
@@ -989,10 +1097,6 @@ class GpuMetricsBase_v11_t final : public GpuMetricsBase_t {
       return m_gpu_metric_ptr;
     }
 
-    void dump_internal_metrics_table() override {
-      return;
-    }
-
     AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() override {
       return AMDGpuMetricVersionFlags_t::kGpuMetricV11;
     }
@@ -1022,10 +1126,6 @@ class GpuMetricsBase_v12_t final : public GpuMetricsBase_t {
       return m_gpu_metric_ptr;
     }
 
-    void dump_internal_metrics_table() override {
-      return;
-    }
-
     AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() override {
       return AMDGpuMetricVersionFlags_t::kGpuMetricV12;
     }
@@ -1054,8 +1154,6 @@ class GpuMetricsBase_v13_t final : public GpuMetricsBase_t {
       return (m_gpu_metric_ptr);
     }
 
-    void dump_internal_metrics_table() override;
-
     AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() override {
       return AMDGpuMetricVersionFlags_t::kGpuMetricV13;
     }
@@ -1085,8 +1183,6 @@ class GpuMetricsBase_v14_t final : public GpuMetricsBase_t {
       return m_gpu_metric_ptr;
     }
 
-    void dump_internal_metrics_table() override;
-
     AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() override {
       return AMDGpuMetricVersionFlags_t::kGpuMetricV14;
     }
@@ -1116,8 +1212,6 @@ class GpuMetricsBase_v15_t final : public GpuMetricsBase_t {
       return m_gpu_metric_ptr;
     }
 
-    void dump_internal_metrics_table() override;
-
     AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() override {
       return AMDGpuMetricVersionFlags_t::kGpuMetricV15;
     }
@@ -1147,8 +1241,6 @@ class GpuMetricsBase_v16_t final : public GpuMetricsBase_t {
     return m_gpu_metric_ptr;
   }
 
-  void dump_internal_metrics_table() override;
-
   AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() override {
     return AMDGpuMetricVersionFlags_t::kGpuMetricV16;
   }
@@ -1177,8 +1269,6 @@ class GpuMetricsBase_v17_t final : public GpuMetricsBase_t {
     return m_gpu_metric_ptr;
   }
 
-  void dump_internal_metrics_table() override;
-
   AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() override {
     return AMDGpuMetricVersionFlags_t::kGpuMetricV17;
   }
@@ -1191,6 +1281,34 @@ class GpuMetricsBase_v17_t final : public GpuMetricsBase_t {
   std::shared_ptr<AMDGpuMetrics_v17_t> m_gpu_metric_ptr;
 };
 
+class GpuMetricsBase_v18_t final : public GpuMetricsBase_t {
+ public:
+  ~GpuMetricsBase_v18_t() = default;
+
+  size_t sizeof_metric_table() override {
+    return sizeof(AMDGpuMetrics_v18_t);
+  }
+
+  GpuMetricTypePtr_t get_metrics_table() override {
+    if (!m_gpu_metric_ptr) {
+      m_gpu_metric_ptr.reset(&m_gpu_metrics_tbl, [](AMDGpuMetrics_v18_t*){});
+    }
+    assert(m_gpu_metric_ptr != nullptr);
+    return m_gpu_metric_ptr;
+  }
+
+  AMDGpuMetricVersionFlags_t get_gpu_metrics_version_used() override {
+    return AMDGpuMetricVersionFlags_t::kGpuMetricV18;
+  }
+
+  rsmi_status_t populate_metrics_dynamic_tbl() override;
+  AMGpuMetricsPublicLatestTupl_t copy_internal_to_external_metrics() override;
+
+ private:
+  AMDGpuMetrics_v18_t m_gpu_metrics_tbl;
+  std::shared_ptr<AMDGpuMetrics_v18_t> m_gpu_metric_ptr;
+};
+
 template<typename T>
 rsmi_status_t rsmi_dev_gpu_metrics_info_query(uint32_t dv_ind,
                         AMDGpuMetricsUnitType_t metric_counter, T& metric_value);
diff --git a/include/rocm_smi/rocm_smi_io_link.h b/include/rocm_smi/rocm_smi_io_link.h
old mode 100755
new mode 100644
index 5903ab9..b1265ba
--- a/include/rocm_smi/rocm_smi_io_link.h
+++ b/include/rocm_smi/rocm_smi_io_link.h
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2020, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_kfd.h b/include/rocm_smi/rocm_smi_kfd.h
old mode 100755
new mode 100644
index 2759dfd..68e7403
--- a/include/rocm_smi/rocm_smi_kfd.h
+++ b/include/rocm_smi/rocm_smi_kfd.h
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2019, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_logger.h b/include/rocm_smi/rocm_smi_logger.h
index f83240f..d51e487 100644
--- a/include/rocm_smi/rocm_smi_logger.h
+++ b/include/rocm_smi/rocm_smi_logger.h
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_main.h b/include/rocm_smi/rocm_smi_main.h
old mode 100755
new mode 100644
index 1d639d7..045ab2e
--- a/include/rocm_smi/rocm_smi_main.h
+++ b/include/rocm_smi/rocm_smi_main.h
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2017-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_monitor.h b/include/rocm_smi/rocm_smi_monitor.h
old mode 100755
new mode 100644
index ad28464..f52144a
--- a/include/rocm_smi/rocm_smi_monitor.h
+++ b/include/rocm_smi/rocm_smi_monitor.h
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2017-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_power_mon.h b/include/rocm_smi/rocm_smi_power_mon.h
old mode 100755
new mode 100644
index 71e4c08..0a8a2f4
--- a/include/rocm_smi/rocm_smi_power_mon.h
+++ b/include/rocm_smi/rocm_smi_power_mon.h
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_properties.h b/include/rocm_smi/rocm_smi_properties.h
index 67d285c..0aa4f4a 100644
--- a/include/rocm_smi/rocm_smi_properties.h
+++ b/include/rocm_smi/rocm_smi_properties.h
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2017-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/include/rocm_smi/rocm_smi_utils.h b/include/rocm_smi/rocm_smi_utils.h
old mode 100755
new mode 100644
index 5263d35..42d009d
--- a/include/rocm_smi/rocm_smi_utils.h
+++ b/include/rocm_smi/rocm_smi_utils.h
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2018-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2018-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
@@ -136,6 +136,8 @@ rsmi_status_t rsmi_get_gfx_target_version(uint32_t dv_ind,
 std::string leftTrim(const std::string &s);
 std::string rightTrim(const std::string &s);
 std::string trim(const std::string &s);
+std::string trimAllWhiteSpace(const std::string &s);
+std::string removeWhitespace(const std::string &s);
 std::string removeNewLines(const std::string &s);
 
 std::string removeString(const std::string origStr,
@@ -144,6 +146,7 @@ void system_wait(int milli_seconds);
 int countDigit(uint64_t n);
 std::string find_file_in_folder(const std::string& folder,
                const std::string& regex);
+uint64_t get_multiplier_from_char(char units_char);
 template <typename T>
   std::string print_int_as_hex(T i, bool showHexNotation = true,
   int overloadBitSize = 0) {
diff --git a/oam/CMakeLists.txt b/oam/CMakeLists.txt
index 181ee1e..7aa1b5f 100644
--- a/oam/CMakeLists.txt
+++ b/oam/CMakeLists.txt
@@ -94,14 +94,16 @@ endif ()
 # use the target_include_directories() command to specify the include directories for the target
 target_include_directories(${OAM_TARGET}
                            PUBLIC
+                           "$<BUILD_INTERFACE:${DRM_INCLUDE_DIRS}>"
+                           "$<BUILD_INTERFACE:${AMDGPU_DRM_INCLUDE_DIRS}>"
                            "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
                            "$<INSTALL_INTERFACE:{OAM_NAME}/include>")
 
 ## Add the install directives for the runtime library.
 install(TARGETS ${OAM_TARGET}
           EXPORT rocm_smiTargets
-          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-          COMPONENT dev)
+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev
+          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev)
 install(TARGETS ${OAM_TARGET}
           LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
           COMPONENT asan)
diff --git a/oam/include/oam/amd_oam.h b/oam/include/oam/amd_oam.h
old mode 100755
new mode 100644
diff --git a/oam/include/oam/oam_mapi.h b/oam/include/oam/oam_mapi.h
old mode 100755
new mode 100644
diff --git a/oam/src/amd_oam.cc b/oam/src/amd_oam.cc
old mode 100755
new mode 100644
diff --git a/oam/src/oamConfig.in b/oam/src/oamConfig.in
old mode 100755
new mode 100644
index bde279c..5f5b96b
--- a/oam/src/oamConfig.in
+++ b/oam/src/oamConfig.in
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
@@ -53,4 +53,4 @@
 #define rocm_smi_VERSION_PATCH @rocm_smi_VERSION_PATCH@
 #define rocm_smi_VERSION_BUILD "@rocm_smi_VERSION_BUILD@"
 
-#endif  // INCLUDE_ROCM_SMI_ROCM_SMI64CONFIG_H_
\ No newline at end of file
+#endif  // INCLUDE_ROCM_SMI_ROCM_SMI64CONFIG_H_
diff --git a/python_smi_tools/README.md b/python_smi_tools/README.md
index 81d9175..0247e40 100644
--- a/python_smi_tools/README.md
+++ b/python_smi_tools/README.md
@@ -456,4 +456,4 @@ The information contained herein is for informational purposes only, and is subj
 
 AMD, the AMD Arrow logo, and combinations thereof are trademarks of Advanced Micro Devices, Inc. Other product names used in this publication are for identification purposes only and may be trademarks of their respective companies.
 
-Copyright (c) 2014-2024 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2014-2025 Advanced Micro Devices, Inc. All rights reserved.
diff --git a/python_smi_tools/rocm_smi.py b/python_smi_tools/rocm_smi.py
index 68ab1b8..6eb22a2 100755
--- a/python_smi_tools/rocm_smi.py
+++ b/python_smi_tools/rocm_smi.py
@@ -17,10 +17,11 @@ import logging
 import os
 import sys
 import subprocess
-import _thread
+import threading
 import time
 import multiprocessing
 import trace
+from os.path import exists
 from io import StringIO
 from time import ctime
 from subprocess import check_output
@@ -49,7 +50,7 @@ except ImportError:
 # Minor version - Increment when adding a new feature, set to 0 when major is incremented
 # Patch version - Increment when adding a fix, set to 0 when minor is incremented
 # Hash  version - Shortened commit hash. Print here and not with lib for consistency with amd-smi
-SMI_MAJ = 3
+SMI_MAJ = 4
 SMI_MIN = 0
 SMI_PAT = 0
 # SMI_HASH is provided by rsmiBindings
@@ -86,6 +87,9 @@ validClockNames = clk_type_names[1:-2]
 validClockNames.append('pcie')
 validClockNames.sort()
 
+# Thread stop condition
+stop_threads = False
+
 def driverInitialized():
     """ Returns true if amdgpu is found in the list of initialized modules
     """
@@ -472,7 +476,7 @@ def getAllocatedMemoryPercent(device):
     mem_use_pct = 0
     if vram_used is None:
         return allocated_memory_vram
-    if vram_used != None and vram_total != None and float(vram_total) != 0:
+    if vram_used is not None and vram_total is not None and float(vram_total) != 0:
         # take floor of result (round down to nearest integer)
         mem_use_pct = (100 * (float(vram_used) / float(vram_total))) // 1
         allocated_memory_vram['value'] = mem_use_pct
@@ -527,7 +531,7 @@ def getProcessName(pid):
     except subprocess.CalledProcessError as e:
         pName = 'UNKNOWN'
 
-    if pName == None:
+    if pName is None:
         pName = 'UNKNOWN'
 
     # Remove the substrings surrounding from process name (b' and \n')
@@ -866,13 +870,16 @@ def printEventList(device, delay, eventList):
     if not rsmi_ret_ok(ret, device, 'set_event_notification_mask'):
         printErrLog(device, 'Unable to set event notification mask.')
         return
-    while 1:  # Exit condition from user keyboard input of 'q' or 'ctrl + c'
+    while not stop_threads:  # Exit condition from user keyboard input of 'q' or 'ctrl + c'
         num_elements = c_uint32(1)
         data = rsmi_evt_notification_data_t(1)
         rocmsmi.rsmi_event_notification_get(delay, byref(num_elements), byref(data))
         if len(data.message) > 0:
             print2DArray([['\rGPU[%d]:\t' % (data.dv_ind), ctime().split()[3], notification_type_names[data.event.value - 1],
                            data.message.decode('utf8') + '\r']])
+    ret = rocmsmi.rsmi_event_notification_stop(device)
+    if not rsmi_ret_ok(ret, device, 'stop_event_notification'):
+        printErrLog(device, 'Unable to end event notifications.')
 
 def printLog(device, metricName, value=None, extraSpace=False, useItalics=False, xcp=None):
     """ Print out to the SMI log
@@ -915,8 +922,8 @@ def printLog(device, metricName, value=None, extraSpace=False, useItalics=False,
 
         # Handle non UTF-8 locale
         try:
-            print(logstr + '\n', end='')
-        except UnicodeEncodeError:
+            print(logstr.encode('utf-8', 'ignore').decode('utf-8'))
+        except UnicodeError:
             print(logstr.encode('ascii', 'ignore').decode('ascii'))
 
         sys.stdout.flush()
@@ -1086,18 +1093,12 @@ def resetClocks(deviceList):
         ret = rocmsmi.rsmi_dev_overdrive_level_set(device, rsmi_dev_perf_level_t(0))
         if rsmi_ret_ok(ret, device, 'set_overdrive_level'):
             printLog(device, 'OverDrive set to 0', None)
-        else:
-            printLog(device, 'Unable to reset OverDrive', None)
         ret = rocmsmi.rsmi_dev_perf_level_set(device, rsmi_dev_perf_level_t(0))
         if rsmi_ret_ok(ret, device, 'set_perf_level'):
             printLog(device, 'Successfully reset clocks', None)
-        else:
-            printLog(device, 'Unable to reset clocks', None)
         ret = rocmsmi.rsmi_dev_perf_level_set(device, rsmi_dev_perf_level_t(0))
         if rsmi_ret_ok(ret, device, 'set_perf_level'):
             printLog(device, 'Performance level reset to auto', None)
-        else:
-            printLog(device, 'Unable to reset performance level to auto', None)
 
 
 def resetFans(deviceList):
@@ -1111,8 +1112,6 @@ def resetFans(deviceList):
         ret = rocmsmi.rsmi_dev_fan_reset(device, sensor_ind)
         if rsmi_ret_ok(ret, device, silent=True):
             printLog(device, 'Successfully reset fan speed to driver control', None)
-        else:
-            printLog(device, 'Not supported on the given system', None)
     printLogSpacer()
 
 
@@ -1134,13 +1133,6 @@ def resetProfile(deviceList):
         ret = rocmsmi.rsmi_dev_power_profile_set(device, 0, profileString('BOOTUP DEFAULT'))
         if rsmi_ret_ok(ret, device, 'set_power_profile'):
             printLog(device, 'Successfully reset Power Profile', None)
-        else:
-            printErrLog(device, 'Unable to reset Power Profile')
-        ret = rocmsmi.rsmi_dev_perf_level_set(device, rsmi_dev_perf_level_t(0))
-        if rsmi_ret_ok(ret, device, 'set_perf_level'):
-            printLog(device, 'Successfully reset Performance Level', None)
-        else:
-            printErrLog(device, 'Unable to reset Performance Level')
     printLogSpacer()
 
 
@@ -1154,8 +1146,6 @@ def resetXgmiErr(deviceList):
         ret = rocmsmi.rsmi_dev_xgmi_error_reset(device)
         if rsmi_ret_ok(ret, device, 'reset xgmi'):
             printLog(device, 'Successfully reset XGMI Error count', None)
-        else:
-            logging.error('GPU[%s]\t\t: Unable to reset XGMI error count', device)
     printLogSpacer()
 
 
@@ -1169,8 +1159,6 @@ def resetPerfDeterminism(deviceList):
         ret = rocmsmi.rsmi_dev_perf_level_set(device, rsmi_dev_perf_level_t(0))
         if rsmi_ret_ok(ret, device, 'disable performance determinism'):
             printLog(device, 'Successfully disabled performance determinism', None)
-        else:
-            logging.error('GPU[%s]\t\t: Unable to disable performance determinism', device)
     printLogSpacer()
 
 
@@ -1203,10 +1191,10 @@ def setClockRange(deviceList, clkType, minvalue, maxvalue, autoRespond):
         if rsmi_ret_ok(ret, device, silent=True):
             printLog(device, 'Successfully set %s from %s(MHz) to %s(MHz)' % (clkType, minvalue, maxvalue), None)
         else:
-            printErrLog(device, 'Unable to set %s from %s(MHz) to %s(MHz)' % (clkType, minvalue, maxvalue))
-            RETCODE = 1
             if ret == rsmi_status_t.RSMI_STATUS_NOT_SUPPORTED:
                 printLog(device, 'Setting %s range is not supported for this device.' % (clkType), None)
+            else:
+                RETCODE = 1
 
 def setClockExtremum(deviceList, level,  clkType, clkValue, autoRespond):
     """ Set the range for the specified clktype in the PowerPlay table for a list of devices.
@@ -1247,10 +1235,10 @@ def setClockExtremum(deviceList, level,  clkType, clkValue, autoRespond):
         if rsmi_ret_ok(ret, device, silent=True):
             printLog(device, 'Successfully set %s %s to %s(MHz)' % (level, clkType, clkValue), None)
         else:
-            printErrLog(device, 'Unable to set %s %s to %s(MHz)' % (level, clkType, clkValue))
-            RETCODE = 1
             if ret == rsmi_status_t.RSMI_STATUS_NOT_SUPPORTED:
                 printLog(device, 'Setting %s %s clock is not supported for this device.' % (level, clkType), None)
+            else:
+                RETCODE = 1
 
 
 def setVoltageCurve(deviceList, point, clk, volt, autoRespond):
@@ -1276,9 +1264,6 @@ def setVoltageCurve(deviceList, point, clk, volt, autoRespond):
         ret = rocmsmi.rsmi_dev_od_volt_info_set(device, int(point), int(clk), int(volt))
         if rsmi_ret_ok(ret, device, 'set_voltage_curve'):
             printLog(device, 'Successfully set voltage point %s to %s(MHz) %s(mV)' % (point, clk, volt), None)
-        else:
-            printErrLog(device, 'Unable to set voltage point %s to %s(MHz) %s(mV)' % (point, clk, volt))
-            RETCODE = 1
 
 
 def setPowerPlayTableLevel(deviceList, clkType, point, clk, volt, autoRespond):
@@ -1309,7 +1294,6 @@ def setPowerPlayTableLevel(deviceList, clkType, point, clk, volt, autoRespond):
             if rsmi_ret_ok(ret, device, 'set_power_play_table_level_' + str(clkType)):
                 printLog(device, 'Successfully set voltage point %s to %s(MHz) %s(mV)' % (point, clk, volt), None)
             else:
-                printErrLog(device, 'Unable to set voltage point %s to %s(MHz) %s(mV)' % (point, clk, volt))
                 RETCODE = 1
         elif clkType == 'mclk':
             ret = rocmsmi.rsmi_dev_od_clk_info_set(device, rsmi_freq_ind_t(int(point)), int(clk),
@@ -1317,7 +1301,6 @@ def setPowerPlayTableLevel(deviceList, clkType, point, clk, volt, autoRespond):
             if rsmi_ret_ok(ret, device, 'set_power_play_table_level_' + str(clkType)):
                 printLog(device, 'Successfully set voltage point %s to %s(MHz) %s(mV)' % (point, clk, volt), None)
             else:
-                printErrLog(device, 'Unable to set voltage point %s to %s(MHz) %s(mV)' % (point, clk, volt))
                 RETCODE = 1
         else:
             printErrLog(device, 'Unable to set %s range' % (clkType))
@@ -1357,8 +1340,6 @@ def setClockOverDrive(deviceList, clktype, value, autoRespond):
             ret = rocmsmi.rsmi_dev_perf_level_set(device, rsmi_dev_perf_level_t(3))
             if rsmi_ret_ok(ret, device, 'set_perf_level_manual_' + str(clktype)):
                 printLog(device, 'Performance level set to manual', None)
-            else:
-                printErrLog(device, 'Unable to set performance level to manual')
         if clktype == 'mclk':
             fsFile = os.path.join('/sys/class/drm', 'card%d' % (device), 'device', 'pp_mclk_od')
             if not os.path.isfile(fsFile):
@@ -1432,14 +1413,13 @@ def setClocks(deviceList, clktype, clk):
             if rsmi_ret_ok(ret, device, 'set_perf_level_manual'):
                 printLog(device, 'Performance level was set to manual', None)
             else:
-                printErrLog(device, 'Unable to set performance level to manual')
                 RETCODE = 1
                 return
         if clktype != 'pcie':
             # Validate frequency bitmask
             freq = rsmi_frequencies_t()
             ret = rocmsmi.rsmi_dev_gpu_clk_freq_get(device, rsmi_clk_names_dict[clktype], byref(freq))
-            if rsmi_ret_ok(ret, device, 'get_gpu_clk_freq_' + str(clktype)) == False:
+            if not rsmi_ret_ok(ret, device, 'get_gpu_clk_freq_' + str(clktype)):
                 RETCODE = 1
                 return
             # The freq_bitmask should be less than 2^(freqs.num_supported)
@@ -1453,13 +1433,12 @@ def setClocks(deviceList, clktype, clk):
             if rsmi_ret_ok(ret, device, 'set_gpu_clk_freq_' + str(clktype)):
                 printLog(device, 'Successfully set %s bitmask to' % (clktype), hex(freq_bitmask))
             else:
-                printErrLog(device, 'Unable to set %s bitmask to: %s' % (clktype, hex(freq_bitmask)))
                 RETCODE = 1
         else:
             # Validate the bandwidth bitmask
             bw = rsmi_pcie_bandwidth_t()
             ret = rocmsmi.rsmi_dev_pci_bandwidth_get(device, byref(bw))
-            if rsmi_ret_ok(ret, device, 'get_PCIe_bandwidth') == False:
+            if not rsmi_ret_ok(ret, device, 'get_PCIe_bandwidth'):
                 RETCODE = 1
                 return
             # The freq_bitmask should be less than 2^(bw.transfer_rate.num_supported)
@@ -1473,7 +1452,6 @@ def setClocks(deviceList, clktype, clk):
             if rsmi_ret_ok(ret, device, 'set_PCIe_bandwidth'):
                 printLog(device, 'Successfully set %s to level bitmask' % (clktype), hex(freq_bitmask))
             else:
-                printErrLog(device, 'Unable to set %s bitmask to: %s' % (clktype, hex(freq_bitmask)))
                 RETCODE = 1
     printLogSpacer()
 
@@ -1498,7 +1476,6 @@ def setPerfDeterminism(deviceList, clkvalue):
         if rsmi_ret_ok(ret, device, 'set_perf_determinism'):
             printLog(device, 'Successfully enabled performance determinism and set GFX clock frequency', str(clkvalue))
         else:
-            printErrLog(device, 'Unable to set performance determinism and clock frequency to %s' % (str(clkvalue)))
             RETCODE = 1
 
 
@@ -1521,9 +1498,6 @@ def resetGpu(device):
     ret = rocmsmi.rsmi_dev_gpu_reset(resetDev)
     if rsmi_ret_ok(ret, resetDev, 'reset_gpu'):
         printLog(resetDev, 'Successfully reset GPU %d' % (resetDev), None)
-    else:
-        printErrLog(resetDev, 'Unable to reset GPU %d' % (resetDev))
-        logging.debug('GPU reset failed with return value of %d' % ret)
     printLogSpacer()
 
 
@@ -1690,7 +1664,7 @@ def setPowerOverDrive(deviceList, value, autoRespond):
             new_power_cap.value = int(value) * 1000000
 
         ret = rocmsmi.rsmi_dev_power_cap_range_get(device, 0, byref(power_cap_max), byref(power_cap_min))
-        if rsmi_ret_ok(ret, device, 'get_power_cap_range') == False:
+        if not rsmi_ret_ok(ret, device, 'get_power_cap_range'):
             printErrLog(device, 'Unable to parse Power OverDrive range')
             RETCODE = 1
             continue
@@ -1897,7 +1871,6 @@ def setMemoryPartition(deviceList, memoryPartition, autoRespond):
             printLog(device, 'Issue reloading driver, please check dmsg for errors',
                      None, addExtraLine)
         else:
-            rsmi_ret_ok(ret, device, 'set_memory_partition')
             printErrLog(device, 'Failed to set memory partition, even though device supports it.')
     printLogSpacer()
 
@@ -2380,7 +2353,7 @@ def getCoarseGrainUtil(device, typeName=None):
     """
     timestamp = c_uint64(0)
 
-    if typeName != None:
+    if typeName is not None:
 
         try:
             i = utilization_counter_name.index(typeName)
@@ -2589,6 +2562,26 @@ def showPcieBw(deviceList):
     max_pkt_sz = c_uint64()
     printLogSpacer(' Measured PCIe Bandwidth ')
     for device in deviceList:
+        # Get BW from GPU metrics from version >= 1.5
+        header = metrics_table_header_t()
+        ret_version = rocmsmi.rsmi_dev_metrics_header_info_get(device, byref(header))
+        if rsmi_ret_ok(ret_version, device, 'get_metrics_header', True):
+            if header.format_revision >= 1 and header.content_revision >= 5:
+                gpu_metrics = rsmi_gpu_metrics_t()
+                ret = rocmsmi.rsmi_dev_gpu_metrics_info_get(device, byref(gpu_metrics))
+                if rsmi_ret_ok(ret, device, "get_gpu_metrics", True):
+                    metric_bw = gpu_metrics.pcie_bandwidth_inst
+                    if metric_bw != ctypes.c_uint64(-1).value and metric_bw > 0:
+                        bandwidth_mbps = metric_bw / 8.0  # Convert megabits to megabytes
+                        bwstr = f"{bandwidth_mbps:.3f}"
+                        printLog(device, "Current PCIe bandwidth (MB/s)", bwstr)
+                        continue
+                    else:
+                        printLog(device, "GPU metrics pcie_bandwidth_inst is invalid", None)
+                else:
+                    printLog(device, "Failed to get GPU metrics info", None)
+
+        # Use legacy API (For GPU metric version < 1.5 or failed)
         ret = rocmsmi.rsmi_dev_pci_throughput_get(device, byref(sent), byref(received), byref(max_pkt_sz))
         if rsmi_ret_ok(ret, device, 'get_PCIe_bandwidth'):
             # Use 1024.0 to ensure that the result is a float and not integer division
@@ -2707,8 +2700,6 @@ def showPower(deviceList):
         elif checkIfSecondaryDie(device):
             printLog(device, 'Average Graphics Package Power (W)', "N/A (Secondary die)")
             secondaryPresent=True
-        else:
-            printErrLog(device, 'Unable to get Average or Current Socket Graphics Package Power Consumption')
     if secondaryPresent:
         printLog(None, "\n\t\tPrimary die (usually one above or below the secondary) shows total (primary + secondary) socket power information", None)
     printLogSpacer()
@@ -2823,13 +2814,20 @@ def showRange(deviceList, rangeType):
         return
     printLogSpacer(' Show Valid %s Range ' % (rangeType))
     odvf = rsmi_od_volt_freq_data_t()
+    uint64_max = UIntegerTypes.UINT64_T
     for device in deviceList:
         ret = rocmsmi.rsmi_dev_od_volt_info_get(device, byref(odvf))
         if rsmi_ret_ok(ret, device, 'get_od_volt', silent=False):
             if rangeType == 'sclk':
+                if odvf.curr_sclk_range.lower_bound == uint64_max or odvf.curr_sclk_range.upper_bound == uint64_max:
+                    printLog(device, 'Unable to display %s range' % (rangeType), None)
+                    continue
                 printLog(device, 'Valid sclk range: %sMhz - %sMhz' % (
                 int(odvf.curr_sclk_range.lower_bound / 1000000), int(odvf.curr_sclk_range.upper_bound / 1000000)), None)
             if rangeType == 'mclk':
+                if odvf.curr_mclk_range.lower_bound == uint64_max or odvf.curr_mclk_range.upper_bound == uint64_max:
+                    printLog(device, 'Unable to display %s range' % (rangeType), None)
+                    continue
                 printLog(device, 'Valid mclk range: %sMhz - %sMhz' % (
                 int(odvf.curr_mclk_range.lower_bound / 1000000), int(odvf.curr_mclk_range.upper_bound / 1000000)), None)
             if rangeType == 'voltage':
@@ -2996,8 +2994,9 @@ def showEvents(deviceList, eventTypes):
     :param eventTypes: List of event type names (can be a single-item list)
     """
     printLogSpacer(' Show Events ')
-    printLog(None, 'press \'q\' or \'ctrl + c\' to quit', None)
+    printLog(None, 'press \'q\' or \'ctrl + c\' and then \'Enter\' to quit', None)
     eventTypeList = []
+    thread_list = []
     for event in eventTypes:  # Cleaning list from wrong values
         if event.replace(',', '').upper() in notification_type_names:
             eventTypeList.append(event.replace(',', '').upper())
@@ -3009,22 +3008,23 @@ def showEvents(deviceList, eventTypes):
         # Create a separate thread for each GPU
         for device in deviceList:
             try:
-                _thread.start_new_thread(printEventList, (device, 1000, eventTypeList))
+                thread = threading.Thread(target=printEventList, args=(device, 1000, eventTypeList))
+                thread_list.append(thread)
+                thread.start()
                 time.sleep(0.25)
             except Exception as e:
                 printErrLog(device, 'Unable to start new thread. %s' % (e))
                 return
-    while 1:  # Exit condition from user keyboard input of 'q' or 'ctrl + c'
-        getch = _Getch()
-        user_input = getch()
+    while 1:  # Exit condition from user keyboard input of 'q' or 'ctrl + c' and then 'Enter'
+        user_input = input()
         # Catch user input for q or Ctrl + c
         if user_input == 'q' or user_input == '\x03':
-            for device in deviceList:
-                ret = rocmsmi.rsmi_event_notification_stop(device)
-                if not rsmi_ret_ok(ret, device, 'stop_event_notification'):
-                    printErrLog(device, 'Unable to end event notifications.')
+            global stop_threads
+            stop_threads = True
             print('\r')
             break
+    for thread in thread_list:
+        thread.join()
 
 
 def printTempGraph(deviceList, delay, temp_type):
@@ -3037,7 +3037,7 @@ def printTempGraph(deviceList, delay, temp_type):
     for i in range(devices):
         printEmptyLine()
     originalTerminalWidth = os.get_terminal_size()[0]
-    while 1:  # Exit condition from user keyboard input of 'q' or 'ctrl + c'
+    while not stop_threads:  # Exit condition from user keyboard input of 'q' or 'ctrl + c'
         terminalWidth = os.get_terminal_size()[0]
         printStrings = list()
         for device in deviceList:
@@ -3117,19 +3117,26 @@ def showTempGraph(deviceList):
     deviceList.sort()
     temp_type = getTemperatureLabel(deviceList)
     printLogSpacer(' Temperature Graph ' + temp_type.capitalize() + ' ')
+    thread_list = []
     # Start a thread for constantly printing
     try:
         # Create a thread (call print function, devices, delay in ms)
-        _thread.start_new_thread(printTempGraph, (deviceList, 150, temp_type))
+        thread = threading.Thread(target=printTempGraph, args=(deviceList, 150, temp_type))
+        thread.start()
+        thread_list.append(thread)
     except Exception as e:
         printErrLog(device, 'Unable to start new thread. %s' % (e))
     # Catch user input for program termination
     while 1:  # Exit condition from user keyboard input of 'q' or 'ctrl + c'
         getch = _Getch()
         user_input = getch()
+        global stop_threads
+        stop_threads = True;
         # Catch user input for q or Ctrl + c
         if user_input == 'q' or user_input == '\x03':
             break
+    for thread in thread_list:
+        thread.join()
     # Reset color to default before exit
     print('\033[A\x1b[0m\r')
     printLogSpacer()
@@ -3178,8 +3185,6 @@ def showVoltageCurve(deviceList):
                 printLog(device, 'Voltage point %d: %sMhz %smV' % (
                 position, int(list(odvf.curve.vc_points)[position].frequency / 1000000),
                 int(list(odvf.curve.vc_points)[position].voltage)), None)
-        else:
-            printErrLog(device, 'Voltage curve Points unsupported.', is_warning=True)
     printLogSpacer()
 
 
@@ -3232,8 +3237,6 @@ def showAccessibleTopology(deviceList):
             ret = rocmsmi.rsmi_is_P2P_accessible(srcdevice, destdevice, byref(accessible))
             if rsmi_ret_ok(ret, metric='is_P2P_accessible'):
                 gpu_links_type[srcdevice][destdevice] = accessible.value
-            else:
-                printErrLog(srcdevice, 'Cannot read link accessibility: Unsupported on this machine')
     if PRINT_JSON:
         formatMatrixToJSON(deviceList, gpu_links_type, "(Topology) Link accessibility between DRM devices {} and {}")
         return
@@ -3272,7 +3275,6 @@ def showWeightTopology(deviceList):
             if rsmi_ret_ok(ret, metric='get_link_weight_topology'):
                 gpu_links_weight[srcdevice][destdevice] = weight
             else:
-                printErrLog(srcdevice, 'Cannot read Link Weight: Not supported on this machine')
                 gpu_links_weight[srcdevice][destdevice] = None
 
 
@@ -3291,7 +3293,7 @@ def showWeightTopology(deviceList):
         for gpu2 in deviceList:
             if (gpu1 == gpu2):
                 printTableRow('%-12s', '0')
-            elif (gpu_links_weight[gpu1][gpu2] == None):
+            elif (gpu_links_weight[gpu1][gpu2] is None):
                 printTableRow('%-12s', 'N/A')
             else:
                 printTableRow('%-12s', gpu_links_weight[gpu1][gpu2].value)
@@ -3319,7 +3321,6 @@ def showHopsTopology(deviceList):
             if rsmi_ret_ok(ret, metric='get_link_type_topology'):
                 gpu_links_hops[srcdevice][destdevice] = hops
             else:
-                printErrLog(srcdevice, 'Cannot read Link Hops: Not supported on this machine')
                 gpu_links_hops[srcdevice][destdevice] = None
 
     if PRINT_JSON:
@@ -3337,7 +3338,7 @@ def showHopsTopology(deviceList):
         for gpu2 in deviceList:
             if (gpu1 == gpu2):
                 printTableRow('%-12s', '0')
-            elif (gpu_links_hops[gpu1][gpu2] == None):
+            elif (gpu_links_hops[gpu1][gpu2] is None):
                 printTableRow('%-12s', 'N/A')
             else:
                 printTableRow('%-12s', gpu_links_hops[gpu1][gpu2].value)
@@ -3370,7 +3371,6 @@ def showTypeTopology(deviceList):
                 else:
                     gpu_links_type[srcdevice][destdevice] = "XXXX"
             else:
-                printErrLog(srcdevice, 'Cannot read Link Type: Not supported on this machine')
                 gpu_links_type[srcdevice][destdevice] = "XXXX"
 
     if PRINT_JSON:
@@ -3406,14 +3406,10 @@ def showNumaTopology(deviceList):
         ret = rocmsmi.rsmi_topo_get_numa_node_number(device, byref(numa_numbers))
         if rsmi_ret_ok(ret, device, 'get_numa_node_number'):
             printLog(device, "(Topology) Numa Node", numa_numbers.value)
-        else:
-            printErrLog(device, "Cannot read Numa Node")
 
         ret = rocmsmi.rsmi_topo_numa_affinity_get(device, byref(numa_numbers))
         if rsmi_ret_ok(ret, metric='get_numa_affinity_topology'):
             printLog(device, "(Topology) Numa Affinity", numa_numbers.value)
-        else:
-            printErrLog(device, 'Cannot read Numa Affinity')
 
 
 def showHwTopology(deviceList):
@@ -3496,8 +3492,7 @@ def showComputePartition(deviceList):
         elif ret == rsmi_status_t.RSMI_STATUS_NOT_SUPPORTED:
             printLog(device, 'Not supported on the given system', None)
         else:
-            rsmi_ret_ok(ret, device, 'get_compute_partition')
-            printErrLog(device, 'Failed to retrieve compute partition, even though device supports it.')
+            printLog(device, 'Failed to retrieve compute partition, even though device supports it.')
     printLogSpacer()
 
 def showMemoryPartition(deviceList):
@@ -3514,8 +3509,7 @@ def showMemoryPartition(deviceList):
         elif ret == rsmi_status_t.RSMI_STATUS_NOT_SUPPORTED:
             printLog(device, 'Not supported on the given system', None)
         else:
-            rsmi_ret_ok(ret, device, 'get_memory_partition')
-            printErrLog(device, 'Failed to retrieve current memory partition, even though device supports it.')
+            printLog(device, 'Failed to retrieve current memory partition, even though device supports it.')
     printLogSpacer()
 
 class UIntegerTypes(IntEnum):
@@ -3799,6 +3793,38 @@ def showGPUMetrics(deviceList):
             },
             "xcp_stats.gfx_below_host_limit_acc": {
                 "value": gpu_metrics.xcp_stats,
+                "unit": count,
+            },
+             "xcp_stats.gfx_below_host_limit_ppt_acc": {
+                "value": gpu_metrics.xcp_stats,
+                "unit": count,
+            },
+            "xcp_stats.gfx_below_host_limit_thm_acc": {
+                "value": gpu_metrics.xcp_stats,
+                "unit": count,
+            },
+            "xcp_stats.gfx_low_utilization_acc": {
+                "value": gpu_metrics.xcp_stats,
+                "unit": count,
+            },
+            "xcp_stats.gfx_below_host_limit_total_acc": {
+                "value": gpu_metrics.xcp_stats,
+                "unit": count,
+            },
+            "xcp_stats.gfx_below_host_limit_ppt_acc": {
+                "value": gpu_metrics.xcp_stats,
+                "unit": percent_unit,
+            },
+            "xcp_stats.gfx_below_host_limit_thm_acc": {
+                "value": gpu_metrics.xcp_stats,
+                "unit": percent_unit,
+            },
+            "xcp_stats.gfx_low_utilization_acc": {
+                "value": gpu_metrics.xcp_stats,
+                "unit": percent_unit,
+            },
+            "xcp_stats.gfx_below_host_limit_total_acc": {
+                "value": gpu_metrics.xcp_stats,
                 "unit": percent_unit,
             },
         }
@@ -3841,14 +3867,37 @@ def showGPUMetrics(deviceList):
                         for _, val in enumerate(item.gfx_below_host_limit_acc):
                             print_xcp_detail.append(validateIfMaxUint(val, UIntegerTypes.UINT64_T))
                         printLog(device, k + " (" + str(v["unit"]) + ")", str(print_xcp_detail), xcp=str(curr_xcp))
+                if 'xcp_stats.gfx_below_host_limit_ppt_acc' in k:
+                    for curr_xcp, item in enumerate(v['value']):
+                        print_xcp_detail = []
+                        for _, val in enumerate(item.gfx_below_host_limit_ppt_acc):
+                            print_xcp_detail.append(validateIfMaxUint(val, UIntegerTypes.UINT64_T))
+                        printLog(device, k + " (" + str(v["unit"]) + ")", str(print_xcp_detail), xcp=str(curr_xcp))
+                if 'xcp_stats.gfx_below_host_limit_thm_acc' in k:
+                    for curr_xcp, item in enumerate(v['value']):
+                        print_xcp_detail = []
+                        for _, val in enumerate(item.gfx_below_host_limit_thm_acc):
+                            print_xcp_detail.append(validateIfMaxUint(val, UIntegerTypes.UINT64_T))
+                        printLog(device, k + " (" + str(v["unit"]) + ")", str(print_xcp_detail), xcp=str(curr_xcp))
+                if 'xcp_stats.gfx_low_utilization_acc' in k:
+                    for curr_xcp, item in enumerate(v['value']):
+                        print_xcp_detail = []
+                        for _, val in enumerate(item.gfx_low_utilization_acc):
+                            print_xcp_detail.append(validateIfMaxUint(val, UIntegerTypes.UINT64_T))
+                        printLog(device, k + " (" + str(v["unit"]) + ")", str(print_xcp_detail), xcp=str(curr_xcp))
+                if 'xcp_stats.gfx_below_host_limit_total_acc' in k:
+                    for curr_xcp, item in enumerate(v['value']):
+                        print_xcp_detail = []
+                        for _, val in enumerate(item.gfx_below_host_limit_total_acc):
+                            print_xcp_detail.append(validateIfMaxUint(val, UIntegerTypes.UINT64_T))
+                        printLog(device, k + " (" + str(v["unit"]) + ")", str(print_xcp_detail), xcp=str(curr_xcp))
 
             if int(device) < (len(deviceList) - 1):
                 printLogSpacer()
         elif ret == rsmi_status_t.RSMI_STATUS_NOT_SUPPORTED:
             printLog(device, 'Not supported on the given system', None)
         else:
-            rsmi_ret_ok(ret, device, 'get_gpu_metrics')
-            printErrLog(device, 'Failed to retrieve GPU metrics, metric version may not be supported for this device.')
+            printLog(device, 'Failed to retrieve GPU metrics, metric version may not be supported for this device.')
     printLogSpacer()
 
 def checkAmdGpus(deviceList):
@@ -3863,6 +3912,44 @@ def checkAmdGpus(deviceList):
     return False
 
 
+def check_runtime_status() -> bool:
+    """Check the runtime status of all AMD GPU devices managed by the amdgpu driver.
+
+    This function scans the directories under the specified path to verify the
+    runtime power management status of each device. It checks the "runtime_status"
+    file for each device to determine if the device is in an "active" state. If any
+    device is not in an "active" state it returns False. If the file is inaccessible,
+    this may be due to a system that does not support runtime power management.
+    Some GPUs support runtime power management, while others may not. This is why the default status
+    is set to True.
+
+    bool: False if any device is not in "active" state, True otherwise.
+    """
+    base_path = "/sys/class/drm"
+    status = True  # Default to True, assuming active unless proven otherwise
+    for device in os.listdir(base_path):
+        if os.path.isdir(os.path.join(base_path, device)):
+            runtime_status_path = os.path.join(base_path, device, "power", "runtime_status")
+            try:
+                with open(runtime_status_path, 'r') as file:
+                    current_status = file.read().strip()
+                    if current_status != "active":
+                        status = False
+                        continue
+                    else:
+                        logging.debug(f"Runtime status for {device}: {current_status}")
+                        status = True
+            except FileNotFoundError:
+                # File does not exist, skip this device
+                continue
+            except PermissionError as e:
+                # Handle permission errors gracefully
+                logging.debug(f"Permission denied while accessing {runtime_status_path} \nError: {e}")
+                continue
+        else:
+            pass
+    return status
+
 def component_str(component):
     """ Returns the component String value
 
@@ -4374,7 +4461,7 @@ if __name__ == '__main__':
 
     if not PRINT_JSON:
         print('\n')
-    if not isConciseInfoRequested(args) and args.showhw == False:
+    if not isConciseInfoRequested(args) and not args.showhw:
         printLogSpacer(headerString)
 
     if args.showallinfo:
@@ -4429,7 +4516,8 @@ if __name__ == '__main__':
 
     if not checkAmdGpus(deviceList):
         logging.warning('No AMD GPUs specified')
-
+    if not check_runtime_status():
+        logging.warning('AMD GPU device(s) is/are in a low-power state. Check power control/runtime_status\n')
     if isConciseInfoRequested(args):
         showAllConcise(deviceList)
     if args.showhw:
@@ -4482,7 +4570,7 @@ if __name__ == '__main__':
         showPcieReplayCount(deviceList)
     if args.showserial:
         showSerialNumber(deviceList)
-    if args.showpids != None:
+    if args.showpids is not None:
         showPids(args.showpids)
     if args.showpidgpus or str(args.showpidgpus) == '[]':
         showGpusByPid(args.showpidgpus)
@@ -4626,10 +4714,10 @@ if __name__ == '__main__':
             devCsv = ''
             sysCsv = ''
             # JSON won't have any 'system' data without one of these flags
-            if args.showdriverversion and args.showallinfo == False:
+            if args.showdriverversion and not args.showallinfo:
                 sysCsv = formatCsv(['system'])
                 print('%s' % (sysCsv))
-            elif args.showallinfo is True:
+            elif args.showallinfo:
                 sysCsv = formatCsv(['system'])
                 devCsv = formatCsv(deviceList)
                 print('%s\n%s' % (sysCsv, devCsv))
@@ -4637,8 +4725,8 @@ if __name__ == '__main__':
                 devCsv = formatCsv(deviceList)
                 print(devCsv)
 
-    if not isConciseInfoRequested(args) and args.showhw == False:
+    if not isConciseInfoRequested(args) and not args.showhw:
         printLogSpacer(footerString)
 
     rsmi_ret_ok(rocmsmi.rsmi_shut_down())
-    exit(RETCODE)
\ No newline at end of file
+    exit(RETCODE)
diff --git a/python_smi_tools/rsmiBindings.py b/python_smi_tools/rsmiBindings.py
index 3a8d11a..69c7860 100644
--- a/python_smi_tools/rsmiBindings.py
+++ b/python_smi_tools/rsmiBindings.py
@@ -108,7 +108,19 @@ class rsmi_dev_perf_level_t(c_int):
     RSMI_DEV_PERF_LEVEL_UNKNOWN = 0x100
 
 
-notification_type_names = ['VM_FAULT', 'THERMAL_THROTTLE', 'GPU_PRE_RESET', 'GPU_POST_RESET', 'RING_HANG']
+notification_type_names = [
+    'VM_FAULT',
+    'THERMAL_THROTTLE',
+    'GPU_PRE_RESET',
+    'GPU_POST_RESET',
+    'MIGRATE_START',
+    'MIGRATE_END',
+    'PAGE_FAULT_START',
+    'PAGE_FAULT_END',
+    'QUEUE_EVICTION',
+    'QUEUE_RESTORE',
+    'UNMAP_FROM_GPU'
+]
 
 
 class rsmi_evt_notification_type_t(c_int):
@@ -118,8 +130,14 @@ class rsmi_evt_notification_type_t(c_int):
     RSMI_EVT_NOTIF_THERMAL_THROTTLE = 2
     RSMI_EVT_NOTIF_GPU_PRE_RESET = 3
     RSMI_EVT_NOTIF_GPU_POST_RESET = 4
-    RSMI_EVT_NOTIF_RING_HANG = 5
-    RSMI_EVT_NOTIF_LAST = RSMI_EVT_NOTIF_RING_HANG
+    RSMI_EVT_NOTIF_MIGRATE_START = 5
+    RSMI_EVT_NOTIF_MIGRATE_END = 6
+    RSMI_EVT_NOTIF_PAGE_FAULT_START = 7
+    RSMI_EVT_NOTIF_PAGE_FAULT_END = 8
+    RSMI_EVT_NOTIF_QUEUE_EVICTION = 9
+    RSMI_EVT_NOTIF_QUEUE_RESTORE = 10
+    RSMI_EVT_NOTIF_UNMAP_FROM_GPU = 11
+    RSMI_EVT_NOTIF_LAST = RSMI_EVT_NOTIF_UNMAP_FROM_GPU
 
 
 class rsmi_voltage_metric_t(c_int):
@@ -545,11 +563,12 @@ class rsmi_error_count_t(Structure):
     _fields_ = [('correctable_err', c_uint64),
                 ('uncorrectable_err', c_uint64)]
 
+MAX_EVENT_NOTIFICATION_MSG_SIZE = 96
 
 class rsmi_evt_notification_data_t(Structure):
     _fields_ = [('dv_ind', c_uint32),
                 ('event', rsmi_evt_notification_type_t),
-                ('message', c_char*64)]
+                ('message', c_char*MAX_EVENT_NOTIFICATION_MSG_SIZE)]
 
 
 class rsmi_process_info_t(Structure):
@@ -666,10 +685,14 @@ class amdgpu_xcp_metrics_t(Structure):
 # amdgpu_xcp_metrics_t._pack_ = 1 # source:False
 amdgpu_xcp_metrics_t._fields_ = [
     ('gfx_busy_inst', c_uint32 * 8),
-    ('jpeg_busy', c_uint16 * 32),
+    ('jpeg_busy', c_uint16 * 40),
     ('vcn_busy', c_uint16 * 4),
     ('gfx_busy_acc', c_uint64 * 8),
     ('gfx_below_host_limit_acc', c_uint64 * 8),
+    ('gfx_below_host_limit_ppt_acc', c_uint64 * 8),
+    ('gfx_below_host_limit_thm_acc', c_uint64 * 8),
+    ('gfx_low_utilization_acc', c_uint64 * 8),
+    ('gfx_below_host_limit_total_acc', c_uint64 * 8),
 ]
 xcp_stats_t = amdgpu_xcp_metrics_t
 
diff --git a/python_smi_tools/rsmiBindings.py.in b/python_smi_tools/rsmiBindings.py.in
index 18a8535..aaed228 100644
--- a/python_smi_tools/rsmiBindings.py.in
+++ b/python_smi_tools/rsmiBindings.py.in
@@ -23,7 +23,7 @@ def initRsmiBindings(silent=False):
             print(args)
 
     rocm_smi_lib_path = os.getenv('ROCM_SMI_LIB_PATH')
-    if (rocm_smi_lib_path != None):
+    if (rocm_smi_lib_path is not None):
         path_librocm = rocm_smi_lib_path
     else:
         path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@'
diff --git a/python_smi_tools/rsmiBindingsInit.py.in b/python_smi_tools/rsmiBindingsInit.py.in
index 12b9218..7c75c4a 100644
--- a/python_smi_tools/rsmiBindingsInit.py.in
+++ b/python_smi_tools/rsmiBindingsInit.py.in
@@ -23,7 +23,7 @@ def initRsmiBindings(silent=False):
             print(args)
 
     rocm_smi_lib_path = os.getenv('ROCM_SMI_LIB_PATH')
-    if (rocm_smi_lib_path != None):
+    if (rocm_smi_lib_path is not None):
         path_librocm = rocm_smi_lib_path
     else:
         path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@'
diff --git a/rocm_smi-backward-compat.cmake b/rocm_smi-backward-compat.cmake
deleted file mode 100644
index d53542b..0000000
--- a/rocm_smi-backward-compat.cmake
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright (c) 2022 Advanced Micro Devices, Inc. All Rights Reserved.
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-cmake_minimum_required(VERSION 3.16.8)
-
-set(RSMI_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
-set(RSMI_WRAPPER_DIR ${RSMI_BUILD_DIR}/wrapper_dir)
-set(RSMI_WRAPPER_INC_DIR ${RSMI_WRAPPER_DIR}/include/${ROCM_SMI})
-set(OAM_TARGET_NAME "oam")
-set(OAM_WRAPPER_INC_DIR ${RSMI_WRAPPER_DIR}/include/${OAM_TARGET_NAME})
-set(RSMI_WRAPPER_LIB_DIR ${RSMI_WRAPPER_DIR}/${ROCM_SMI}/lib)
-set(OAM_WRAPPER_LIB_DIR ${RSMI_WRAPPER_DIR}/${OAM_TARGET_NAME}/lib)
-## package headers
-set(PUBLIC_RSMI_HEADERS
-    rocm_smi.h
-    ${ROCM_SMI_TARGET}Config.h
-    kfd_ioctl.h)
-set(OAM_HEADERS
-    oam_mapi.h
-    amd_oam.h)
-
-#Function to generate header template file
-function(create_header_template)
-    file(WRITE ${RSMI_WRAPPER_DIR}/header.hpp.in "/*
-    Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the \"Software\"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-   */
-
-#ifndef @include_guard@
-#define @include_guard@
-
-#ifndef ROCM_HEADER_WRAPPER_WERROR
-#define ROCM_HEADER_WRAPPER_WERROR @deprecated_error@
-#endif
-#if ROCM_HEADER_WRAPPER_WERROR  /* ROCM_HEADER_WRAPPER_WERROR 1 */
-#error \"This file is deprecated. Use file from include path /opt/rocm-ver/include/ and prefix with @prefix_name@\"
-#else  /* ROCM_HEADER_WRAPPER_WERROR 0 */
-#if defined(__GNUC__)
-#warning \"This file is deprecated. Use file from include path /opt/rocm-ver/include/ and prefix with @prefix_name@\"
-#else
-#pragma message(\"This file is deprecated. Use file from include path /opt/rocm-ver/include/ and prefix with @prefix_name@\")
-#endif
-#endif  /* ROCM_HEADER_WRAPPER_WERROR */
-
-@include_statements@
-
-#endif")
-endfunction()
-
-#use header template file and generate wrapper header files
-function(generate_wrapper_header)
-  file(MAKE_DIRECTORY ${RSMI_WRAPPER_INC_DIR})
-  set(prefix_name "${prefix_name}${ROCM_SMI}")
-  #Generate wrapper header files from  the list
-  foreach(header_file ${PUBLIC_RSMI_HEADERS})
-    # set include guard
-    get_filename_component(INC_GAURD_NAME ${header_file} NAME_WE)
-    string(TOUPPER ${INC_GAURD_NAME} INC_GAURD_NAME)
-    set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H")
-    #set #include statement
-    get_filename_component(file_name ${header_file} NAME)
-    set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${ROCM_SMI}/${file_name}\"\n")
-    configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${RSMI_WRAPPER_INC_DIR}/${file_name})
-    unset(include_guard)
-    unset(include_statements)
-  endforeach()
-  unset(prefix_name)
-
-#OAM Wrpper Header file generation
-  file(MAKE_DIRECTORY ${OAM_WRAPPER_INC_DIR})
-  set(prefix_name "${prefix_name}${OAM_TARGET_NAME}")
-  #Generate wrapper header files from  the list
-  foreach(header_file ${OAM_HEADERS})
-    # set include guard
-    get_filename_component(INC_GAURD_NAME ${header_file} NAME_WE)
-    string(TOUPPER ${INC_GAURD_NAME} INC_GAURD_NAME)
-    set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H")
-    #set #include statement
-    get_filename_component(file_name ${header_file} NAME)
-    set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${OAM_TARGET_NAME}/${file_name}\"\n")
-    configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${OAM_WRAPPER_INC_DIR}/${file_name})
-    unset(include_guard)
-    unset(include_statements)
-  endforeach()
-  unset(prefix_name)
-
-endfunction()
-
-#function to create symlink to libraries
-function(create_library_symlink)
-
-  file(MAKE_DIRECTORY ${RSMI_WRAPPER_LIB_DIR})
-  if(BUILD_SHARED_LIBS)
-
-    #get rsmi lib versions
-    set(SO_VERSION_GIT_TAG_PREFIX "rsmi_so_ver")
-    get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
-    if(${ROCM_PATCH_VERSION})
-      set(VERSION_PATCH ${ROCM_PATCH_VERSION})
-      set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-    else()
-      set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
-    endif()
-
-    #link RSMI library files
-    set(LIB_RSMI "${ROCM_SMI_LIB_NAME}.so")
-    set(library_files "${LIB_RSMI}"  "${LIB_RSMI}.${VERSION_MAJOR}" "${LIB_RSMI}.${SO_VERSION_STRING}")
-  else()
-    set(LIB_RSMI "${ROCM_SMI_LIB_NAME}.a")
-    set(library_files "${LIB_RSMI}")
-  endif()
-
-  foreach(file_name ${library_files})
-     add_custom_target(link_${file_name} ALL
-                  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                  COMMAND ${CMAKE_COMMAND} -E create_symlink
-                  ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name})
-  endforeach()
-
-  file(MAKE_DIRECTORY ${OAM_WRAPPER_LIB_DIR})
-  if(BUILD_SHARED_LIBS)
-
-    #get OAM lib versions
-    set(SO_VERSION_GIT_TAG_PREFIX "oam_so_ver")
-    get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
-    if(${ROCM_PATCH_VERSION})
-      set(VERSION_PATCH ${ROCM_PATCH_VERSION})
-      set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-    else()
-      set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
-    endif()
-
-    #link OAM library files
-    set(LIB_OAM "lib${OAM_TARGET_NAME}.so")
-    set(library_files "${LIB_OAM}"  "${LIB_OAM}.${VERSION_MAJOR}" "${LIB_OAM}.${SO_VERSION_STRING}")
-  else()
-    set(LIB_OAM "lib${OAM_TARGET_NAME}.a")
-    set(library_files "${LIB_OAM}")
-  endif()
-
-  foreach(file_name ${library_files})
-     add_custom_target(link_${file_name} ALL
-                  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                  COMMAND ${CMAKE_COMMAND} -E create_symlink
-                  ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name})
-  endforeach()
-
-endfunction()
-
-#Creater a template for header file
-create_header_template()
-#Use template header file and generater wrapper header files
-generate_wrapper_header()
-install(DIRECTORY ${RSMI_WRAPPER_INC_DIR}
-        DESTINATION ${ROCM_SMI}/include
-        COMPONENT dev)
-install(DIRECTORY ${OAM_WRAPPER_INC_DIR}
-        DESTINATION ${OAM_TARGET_NAME}/include
-        COMPONENT dev)
-# Create symlink to library files
-create_library_symlink()
-install(DIRECTORY ${RSMI_WRAPPER_LIB_DIR}
-        DESTINATION ${ROCM_SMI}
-        COMPONENT dev)
-install(DIRECTORY ${OAM_WRAPPER_LIB_DIR}
-        DESTINATION ${OAM_TARGET_NAME}
-        COMPONENT dev )
diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt
old mode 100755
new mode 100644
index 257309b..23485ae
--- a/rocm_smi/CMakeLists.txt
+++ b/rocm_smi/CMakeLists.txt
@@ -88,15 +88,13 @@ target_include_directories(${ROCM_SMI_TARGET} PRIVATE
 # use the target_include_directories() command to specify the include directories for the target
 target_include_directories(${ROCM_SMI_TARGET}
                            PUBLIC
+                           "$<BUILD_INTERFACE:${DRM_INCLUDE_DIRS}>"
+                           "$<BUILD_INTERFACE:${AMDGPU_DRM_INCLUDE_DIRS}>"
                            "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
                            "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 )
 
-if(FILE_REORG_BACKWARD_COMPATIBILITY)
-    target_include_directories(${ROCM_SMI_TARGET}
-                           PUBLIC
-                           "$<INSTALL_INTERFACE:${ROCM_SMI}/include>")
-endif()
+target_include_directories(${ROCM_SMI_TARGET} INTERFACE ${DRM_INCLUDE_DIRS})
 
 ## Set the VERSION and SOVERSION values
 set_property(TARGET ${ROCM_SMI_TARGET} PROPERTY
diff --git a/rocm_smi/example/rocm_smi_example.cc b/rocm_smi/example/rocm_smi_example.cc
old mode 100755
new mode 100644
index f6a3b8b..a370abe
--- a/rocm_smi/example/rocm_smi_example.cc
+++ b/rocm_smi/example/rocm_smi_example.cc
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2017-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
@@ -991,6 +991,11 @@ int main() {
       std::cout << "\t  -> " << std::dec << dclk << "\n";
     }
 
+    std::cout << "\t**.jpeg_activity[] : " << std::dec << "\n";
+    for (const auto& jpeg : gpu_metrics.jpeg_activity) {
+      std::cout << "\t  -> " << std::dec << jpeg << "\n";
+    }
+
     std::cout << std::dec << "xcp_stats.gfx_busy_inst = \n";
     auto xcp = 0;
     for (auto& row : gpu_metrics.xcp_stats) {
@@ -1046,6 +1051,50 @@ int main() {
       xcp++;
     }
 
+    xcp = 0;
+    std::cout << std::dec << "xcp_stats.gfx_below_host_limit_ppt_acc = \n";  // new for 1.8
+    for (auto& row : gpu_metrics.xcp_stats) {
+      std::cout << "XCP[" << xcp << "] = " << "[ ";
+      std::copy(std::begin(row.gfx_below_host_limit_ppt_acc),
+              std::end(row.gfx_below_host_limit_ppt_acc),
+              amd::smi::make_ostream_joiner(&std::cout, ", "));
+      std::cout << " ]\n";
+      xcp++;
+    }
+
+    xcp = 0;
+    std::cout << std::dec << "xcp_stats.gfx_below_host_limit_thm_acc = \n";  // new for 1.8
+    for (auto& row : gpu_metrics.xcp_stats) {
+      std::cout << "XCP[" << xcp << "] = " << "[ ";
+      std::copy(std::begin(row.gfx_below_host_limit_thm_acc),
+              std::end(row.gfx_below_host_limit_thm_acc),
+              amd::smi::make_ostream_joiner(&std::cout, ", "));
+      std::cout << " ]\n";
+      xcp++;
+    }
+
+    xcp = 0;
+    std::cout << std::dec << "xcp_stats.gfx_low_utilization_acc = \n";
+    for (auto& row : gpu_metrics.xcp_stats) {
+      std::cout << "XCP[" << xcp << "] = " << "[ ";
+      std::copy(std::begin(row.gfx_low_utilization_acc),
+              std::end(row.gfx_low_utilization_acc),
+              amd::smi::make_ostream_joiner(&std::cout, ", "));
+      std::cout << " ]\n";
+      xcp++;
+    }
+
+    xcp = 0;
+    std::cout << std::dec << "xcp_stats.gfx_below_host_limit_total_acc = \n";
+    for (auto& row : gpu_metrics.xcp_stats) {
+      std::cout << "XCP[" << xcp << "] = " << "[ ";
+      std::copy(std::begin(row.gfx_below_host_limit_total_acc),
+              std::end(row.gfx_below_host_limit_total_acc),
+              amd::smi::make_ostream_joiner(&std::cout, ", "));
+      std::cout << " ]\n";
+      xcp++;
+    }
+
     std::cout << "\n";
     std::cout << "\t ** -> Checking metrics with constant changes ** " << "\n";
     constexpr uint16_t kMAX_ITER_TEST = 10;
diff --git a/src/rocm_smi.cc b/src/rocm_smi.cc
old mode 100755
new mode 100644
index 758ef3a..561798a
--- a/src/rocm_smi.cc
+++ b/src/rocm_smi.cc
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2017-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
@@ -48,6 +48,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <pthread.h>
+#include <inttypes.h>
 
 #include <cstddef>
 #include <string>
@@ -198,39 +199,6 @@ static uint64_t freq_string_to_int(const std::vector<std::string> &freq_lines,
   return static_cast<uint64_t>(freq*multiplier);
 }
 
-static void freq_volt_string_to_point(std::string in_line,
-                                                     rsmi_od_vddc_point_t *pt) {
-  std::istringstream fs_vlt(in_line);
-
-  assert(pt != nullptr);
-  THROW_IF_NULLPTR_DEREF(pt)
-
-  uint32_t ind;
-  float freq;
-  float volts;
-  std::string junk;
-  std::string freq_units_str;
-  std::string volts_units_str;
-
-  fs_vlt >> ind;
-  fs_vlt >> junk;  // colon
-  fs_vlt >> freq;
-  fs_vlt >> freq_units_str;
-  fs_vlt >> volts;
-  fs_vlt >> volts_units_str;
-
-  if (freq < 0) {
-    throw amd::smi::rsmi_exception(RSMI_STATUS_UNEXPECTED_SIZE, __FUNCTION__);
-  }
-
-  long double multiplier = get_multiplier_from_str(freq_units_str[0]);
-
-  pt->frequency = static_cast<uint64_t>(freq*multiplier);
-
-  multiplier = get_multiplier_from_str(volts_units_str[0]);
-  pt->voltage = static_cast<uint64_t>(volts*multiplier);
-}
-
 static void od_value_pair_str_to_range(std::string in_line, rsmi_range_t *rg) {
   std::istringstream fs_rng(in_line);
 
@@ -318,6 +286,7 @@ static rsmi_status_t get_dev_value_str(amd::smi::DevInfoTypes type,
 
   return amd::smi::ErrnoToRsmiStatus(ret);
 }
+
 static rsmi_status_t get_dev_value_int(amd::smi::DevInfoTypes type,
                                          uint32_t dv_ind, uint64_t *val_int) {
   assert(val_int != nullptr);
@@ -369,9 +338,31 @@ static rsmi_status_t get_dev_mon_value(amd::smi::MonitorTypes type,
     return amd::smi::ErrnoToRsmiStatus(ret);
   }
 
+  if (val_str.empty()) {
+    std::ostringstream ss;
+    ss << __PRETTY_FUNCTION__
+    << " | ======= end ======= "
+    << " | Fail "
+    << " | Device #: " << dv_ind
+    << " | Type: " << monitorTypesToString.at(type)
+    << " | Cause: SYSFS read was empty"
+    << " | Returning = "
+    << getRSMIStatusString(RSMI_STATUS_UNEXPECTED_DATA) << " |";
+    LOG_INFO(ss);
+    return RSMI_STATUS_UNEXPECTED_DATA;
+  }
+
   if (!amd::smi::IsInteger(val_str)) {
-    std::cerr << "Expected integer value from monitor,"
-                                " but got \"" << val_str << "\"" << std::endl;
+    std::ostringstream ss;
+    ss << __PRETTY_FUNCTION__
+    << " | ======= end ======= "
+    << " | Fail "
+    << " | Device #: " << dv_ind
+    << " | Type: " << monitorTypesToString.at(type)
+    << " | Cause: Expected integer value from monitor, but got "<< val_str
+    << " | Returning = "
+    << getRSMIStatusString(RSMI_STATUS_UNEXPECTED_DATA) << " |";
+    LOG_INFO(ss);
     return RSMI_STATUS_UNEXPECTED_DATA;
   }
 
@@ -398,9 +389,31 @@ static rsmi_status_t get_dev_mon_value(amd::smi::MonitorTypes type,
     return amd::smi::ErrnoToRsmiStatus(ret);
   }
 
+  if (val_str.empty()) {
+    std::ostringstream ss;
+    ss << __PRETTY_FUNCTION__
+    << " | ======= end ======= "
+    << " | Fail "
+    << " | Device #: " << dv_ind
+    << " | Type: " << monitorTypesToString.at(type)
+    << " | Cause: SYSFS read was empty"
+    << " | Returning = "
+    << getRSMIStatusString(RSMI_STATUS_UNEXPECTED_DATA) << " |";
+    LOG_INFO(ss);
+    return RSMI_STATUS_UNEXPECTED_DATA;
+  }
+
   if (!amd::smi::IsInteger(val_str)) {
-    std::cerr << "Expected integer value from monitor,"
-                                " but got \"" << val_str << "\"" << std::endl;
+    std::ostringstream ss;
+    ss << __PRETTY_FUNCTION__
+    << " | ======= end ======= "
+    << " | Fail "
+    << " | Device #: " << dv_ind
+    << " | Type: " << monitorTypesToString.at(type)
+    << " | Cause: Expected integer value from monitor, but got "<< val_str
+    << " | Returning = "
+    << getRSMIStatusString(RSMI_STATUS_UNEXPECTED_DATA) << " |";
+    LOG_INFO(ss);
     return RSMI_STATUS_UNEXPECTED_DATA;
   }
 
@@ -735,7 +748,7 @@ rsmi_dev_ecc_count_get(uint32_t dv_ind, rsmi_gpu_block_t block,
   fs2 >> ec->correctable_err;
 
   ss << __PRETTY_FUNCTION__ << " | ======= end ======="
-     << ", reporting " << amd::smi::getRSMIStatusString(ret);;
+     << ", reporting " << amd::smi::getRSMIStatusString(ret);
   LOG_TRACE(ss);
   return ret;
   CATCH
@@ -795,11 +808,15 @@ rsmi_topo_numa_affinity_get(uint32_t dv_ind, int32_t *numa_node) {
   TRY
   rsmi_status_t ret;
 
-  CHK_SUPPORT_NAME_ONLY(numa_node)
-
   DEVICE_MUTEX
+  if (!numa_node) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
   std::string str_val;
   ret = get_dev_value_str(amd::smi::kDevNumaNode, dv_ind, &str_val);
+  if (ret != RSMI_STATUS_SUCCESS) {
+    return ret;
+  }
   *numa_node = std::stoi(str_val, nullptr);
 
   return ret;
@@ -846,12 +863,46 @@ rsmi_dev_id_get(uint32_t dv_ind, uint16_t *id) {
   rsmi_status_t ret;
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
+  if (id == nullptr) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
   CHK_SUPPORT_NAME_ONLY(id)
+  // Set the device ID to max value
+  *id = std::numeric_limits<uint16_t>::max();
 
+  // Get the device ID from KGD
   ret = get_id(dv_ind, amd::smi::kDevDevID, id);
-  ss << __PRETTY_FUNCTION__ << " | ======= end ======="
-     << ", reporting " << amd::smi::getRSMIStatusString(ret);
   LOG_TRACE(ss);
+  ss << __PRETTY_FUNCTION__
+     << (ret == RSMI_STATUS_SUCCESS ?
+          " | No fall back needed retrieved from KGD" : " | fall back needed")
+     << " | Device #: " << std::to_string(dv_ind)
+     << " | Data: device_id = " << std::to_string(*id)
+     << " | ret = " << getRSMIStatusString(ret, false);
+  LOG_DEBUG(ss);
+  // If the device ID is not supported, use KFD's device ID
+  if (ret != RSMI_STATUS_SUCCESS) {
+    GET_DEV_AND_KFDNODE_FROM_INDX
+    uint32_t node_id;
+    uint64_t kfd_device_id;
+    int ret_kfd = kfd_node->get_node_id(&node_id);
+    ret_kfd = amd::smi::read_node_properties(node_id, "device_id", &kfd_device_id);
+    if (ret_kfd == 0) {
+      *id = static_cast<uint16_t>(kfd_device_id);
+      ret = RSMI_STATUS_SUCCESS;
+    } else {
+      *id = std::numeric_limits<uint16_t>::max();
+      ret = RSMI_STATUS_NOT_SUPPORTED;
+    }
+    ss << __PRETTY_FUNCTION__
+       << " | Issue: Could not read device from sysfs, falling back to KFD" << "\n"
+       << " ; Device #: " << std::to_string(dv_ind) << "\n"
+       << " ; ret_kfd: " << std::to_string(ret_kfd) << "\n"
+       << " ; node: " << std::to_string(node_id) << "\n"
+       << " ; Data: device_id (from KFD)= " << std::to_string(*id) << "\n"
+       << " ; ret = " << getRSMIStatusString(ret, false);
+    LOG_DEBUG(ss);
+  }
   return ret;
 }
 
@@ -862,6 +913,7 @@ rsmi_dev_xgmi_physical_id_get(uint32_t dv_ind, uint16_t *id) {
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
   CHK_SUPPORT_NAME_ONLY(id)
+  *id = std::numeric_limits<uint16_t>::max();
 
   ret = get_id(dv_ind, amd::smi::kDevXGMIPhysicalID, id);
   ss << __PRETTY_FUNCTION__ << " | ======= end ======="
@@ -907,16 +959,54 @@ rsmi_dev_subsystem_id_get(uint32_t dv_ind, uint16_t *id) {
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
   CHK_SUPPORT_NAME_ONLY(id)
-  return get_id(dv_ind, amd::smi::kDevSubSysDevID, id);
+  auto ret = get_id(dv_ind, amd::smi::kDevSubSysDevID, id);
+  ss << __PRETTY_FUNCTION__ << " | ======= end ======="
+     << ", reporting " << amd::smi::getRSMIStatusString(ret, false);
+  LOG_INFO(ss);
+  return ret;
 }
 
 rsmi_status_t
 rsmi_dev_vendor_id_get(uint32_t dv_ind, uint16_t *id) {
+  TRY
   std::ostringstream ss;
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
+  if (!id) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
   CHK_SUPPORT_NAME_ONLY(id)
-  return get_id(dv_ind, amd::smi::kDevVendorID, id);
+  int ret_kfd = 0;
+  uint32_t node_id;
+  rsmi_status_t ret = get_id(dv_ind, amd::smi::kDevVendorID, id);
+  bool need_fallback = false;
+  if (ret != RSMI_STATUS_SUCCESS) {
+    need_fallback = true;
+  }
+  if (ret != RSMI_STATUS_SUCCESS) {
+    GET_DEV_AND_KFDNODE_FROM_INDX
+    uint64_t kfd_vendor_id;
+    ret_kfd = kfd_node->get_node_id(&node_id);
+    ret_kfd = amd::smi::read_node_properties(node_id, "vendor_id", &kfd_vendor_id);
+    if (ret_kfd == 0) {
+      *id = static_cast<uint16_t>(kfd_vendor_id);
+      ret = RSMI_STATUS_SUCCESS;
+    } else {
+      *id = std::numeric_limits<uint16_t>::max();
+      ret = RSMI_STATUS_NOT_SUPPORTED;
+    }
+  }
+  ss << __PRETTY_FUNCTION__
+     << (need_fallback ? " | Needed to fallback to use KFD to read vendor_id" :
+      " | Read through SYSFS to read vendor_id") << "\n"
+     << " ; Device #: " << std::to_string(dv_ind) << "\n"
+     << " ; ret_kfd: " << std::to_string(ret_kfd) << "\n"
+     << " ; node: " << std::to_string(node_id) << "\n"
+     << " ; Data: vendor_id: " << std::to_string(*id) << "\n"
+     << " ; ret = " << getRSMIStatusString(ret, false);
+  LOG_INFO(ss);
+  return ret;
+  CATCH
 }
 
 rsmi_status_t
@@ -936,8 +1026,11 @@ rsmi_dev_perf_level_get(uint32_t dv_ind, rsmi_dev_perf_level_t *perf) {
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
 
-  CHK_SUPPORT_NAME_ONLY(perf)
   DEVICE_MUTEX
+  if (!perf) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
+  CHK_SUPPORT_NAME_ONLY(perf)
 
   rsmi_status_t ret = get_dev_value_str(amd::smi::kDevPerfLevel, dv_ind,
                                                                     &val_str);
@@ -1006,6 +1099,11 @@ rsmi_dev_overdrive_level_get(uint32_t dv_ind, uint32_t *od) {
   CHK_SUPPORT_NAME_ONLY(od)
   DEVICE_MUTEX
 
+  // Bare Metal only feature
+  if (amd::smi::is_vm_guest()) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
+
   rsmi_status_t ret = get_dev_value_str(amd::smi::kDevOverDriveLevel, dv_ind,
                                                                     &val_str);
   if (ret != RSMI_STATUS_SUCCESS) {
@@ -1075,6 +1173,12 @@ rsmi_dev_overdrive_level_set_v1(uint32_t dv_ind, uint32_t od) {
   if (od > kMaxOverdriveLevel) {
     return RSMI_STATUS_INVALID_ARGS;
   }
+
+  // Bare Metal only feature
+  if (amd::smi::is_vm_guest()) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
+
   DEVICE_MUTEX
   return set_dev_value(amd::smi::kDevOverDriveLevel, dv_ind, od);
   CATCH
@@ -1116,7 +1220,7 @@ static rsmi_status_t get_frequencies(amd::smi::DevInfoTypes type, rsmi_clk_type_
     return RSMI_STATUS_INVALID_ARGS;
   }
   memset(f, 0, sizeof(rsmi_frequencies_t));
-  f->current=0;
+  f->current = 0;
 
   ret = GetDevValueVec(type, dv_ind, &val_vec);
   if (ret != RSMI_STATUS_SUCCESS) {
@@ -1284,6 +1388,12 @@ static rsmi_status_t get_od_clk_volt_info(uint32_t dv_ind,
     return RSMI_STATUS_INVALID_ARGS;
   }
 
+  // fill out rsmi_od_volt_freq_data_t p with default max values to indicate no valid data
+  p->curr_sclk_range.lower_bound = UINT64_MAX;
+  p->curr_sclk_range.upper_bound = UINT64_MAX;
+  p->curr_mclk_range.lower_bound = UINT64_MAX;
+  p->curr_mclk_range.upper_bound = UINT64_MAX;
+
   ret = GetDevValueVec(amd::smi::kDevPowerODVoltage, dv_ind, &val_vec);
   if (ret != RSMI_STATUS_SUCCESS) {
     return ret;
@@ -1311,13 +1421,6 @@ static rsmi_status_t get_od_clk_volt_info(uint32_t dv_ind,
     .set_key_data_splitter(":", amd::smi::TagSplitterPositional_t::kBETWEEN)
     .structure_content();
 
-  //
-  // Note:  We must have minimum of 'GFXCLK:' && 'MCLK:' OR:
-  //        'OD_SCLK:' && 'OD_MCLK:' tags.
-  if (txt_power_dev_od_voltage.get_title_size() < kMIN_VALID_LINES)  {
-      return rsmi_status_t::RSMI_STATUS_NO_DATA;
-  }
-
   // Note:  For debug builds/purposes only.
   assert(txt_power_dev_od_voltage.contains_title_key(kTAG_GFXCLK) ||
          txt_power_dev_od_voltage.contains_title_key(kTAG_OD_SCLK));
@@ -1338,47 +1441,60 @@ static rsmi_status_t get_od_clk_volt_info(uint32_t dv_ind,
       return std::vector<std::string>{upper_bound_data};
   };
 
-  // Validates 'OD_SCLK' is in the structure
-  if (txt_power_dev_od_voltage.contains_structured_key(kTAG_OD_SCLK,
+    // track the number of keys found, if this goes down to 0 then that means that there is no valid data
+    const uint8_t kNumStructuredKeysToCheck = 6;
+    uint8_t structured_key_counter = kNumStructuredKeysToCheck;
+    // Validates 'OD_SCLK' is in the structure
+    if (txt_power_dev_od_voltage.contains_structured_key(kTAG_OD_SCLK,
                                                        KTAG_FIRST_FREQ_IDX)) {
       p->curr_sclk_range.lower_bound = freq_string_to_int(build_lower_bound(kTAG_OD_SCLK), nullptr, nullptr, 0);
       p->curr_sclk_range.upper_bound = freq_string_to_int(build_upper_bound(kTAG_OD_SCLK), nullptr, nullptr, 0);
-
+    }
+    else
+        structured_key_counter--;
       // Validates 'OD_MCLK' is in the structure
-      if (txt_power_dev_od_voltage.contains_structured_key(KTAG_OD_MCLK,
-                                                           KTAG_FIRST_FREQ_IDX)) {
-          p->curr_mclk_range.lower_bound = freq_string_to_int(build_lower_bound(KTAG_OD_MCLK), nullptr, nullptr, 0);
-          p->curr_mclk_range.upper_bound = freq_string_to_int(build_upper_bound(KTAG_OD_MCLK), nullptr, nullptr, 0);
-      }
+    if (txt_power_dev_od_voltage.contains_structured_key(KTAG_OD_MCLK,
+                                                        KTAG_FIRST_FREQ_IDX)) {
+        p->curr_mclk_range.lower_bound = freq_string_to_int(build_lower_bound(KTAG_OD_MCLK), nullptr, nullptr, 0);
+        p->curr_mclk_range.upper_bound = freq_string_to_int(build_upper_bound(KTAG_OD_MCLK), nullptr, nullptr, 0);
+    }
+    else
+        structured_key_counter--;
 
-      // Validates 'OD_RANGE' is in the structure
-      if (txt_power_dev_od_voltage.contains_structured_key(KTAG_OD_RANGE,
-                                                           KTAG_SCLK)) {
-          od_value_pair_str_to_range(txt_power_dev_od_voltage
-                                        .get_structured_value_by_keys(KTAG_OD_RANGE, KTAG_SCLK),
-                                     &p->sclk_freq_limits);
-      }
-      if (txt_power_dev_od_voltage.contains_structured_key(KTAG_OD_RANGE,
-                                                           KTAG_MCLK)) {
-          od_value_pair_str_to_range(txt_power_dev_od_voltage
-                                        .get_structured_value_by_keys(KTAG_OD_RANGE, KTAG_MCLK),
-                                     &p->mclk_freq_limits);
-      }
-  }
-  // Validates 'GFXCLK' is in the structure
-  else if (txt_power_dev_od_voltage.contains_structured_key(kTAG_GFXCLK,
-                                                            KTAG_FIRST_FREQ_IDX)) {
-      p->curr_sclk_range.lower_bound = freq_string_to_int(build_lower_bound(kTAG_GFXCLK), nullptr, nullptr, 0);
-      p->curr_sclk_range.upper_bound = freq_string_to_int(build_upper_bound(kTAG_GFXCLK), nullptr, nullptr, 0);
-
-      // Validates 'MCLK' is in the structure
-      if (txt_power_dev_od_voltage.contains_structured_key(KTAG_MCLK,
-                                                           KTAG_FIRST_FREQ_IDX)) {
-          p->curr_mclk_range.lower_bound = freq_string_to_int(build_lower_bound(KTAG_MCLK), nullptr, nullptr, 0);
-          p->curr_mclk_range.upper_bound = freq_string_to_int(build_upper_bound(KTAG_MCLK), nullptr, nullptr, 0);
-      }
-  }
-  else {
+    // Validates 'OD_RANGE' is in the structure
+    if (txt_power_dev_od_voltage.contains_structured_key(KTAG_OD_RANGE,
+                                                        KTAG_SCLK)) {
+        od_value_pair_str_to_range(txt_power_dev_od_voltage
+                                    .get_structured_value_by_keys(KTAG_OD_RANGE, KTAG_SCLK),
+                                    &p->sclk_freq_limits);
+    }
+    else
+        structured_key_counter--;
+    if (txt_power_dev_od_voltage.contains_structured_key(KTAG_OD_RANGE,
+                                                        KTAG_MCLK)) {
+        od_value_pair_str_to_range(txt_power_dev_od_voltage
+                                    .get_structured_value_by_keys(KTAG_OD_RANGE, KTAG_MCLK),
+                                    &p->mclk_freq_limits);
+    }
+    else
+        structured_key_counter--;
+    // Validates 'GFXCLK' is in the structure
+    if (txt_power_dev_od_voltage.contains_structured_key(kTAG_GFXCLK,
+                                                                KTAG_FIRST_FREQ_IDX)) {
+        p->curr_sclk_range.lower_bound = freq_string_to_int(build_lower_bound(kTAG_GFXCLK), nullptr, nullptr, 0);
+        p->curr_sclk_range.upper_bound = freq_string_to_int(build_upper_bound(kTAG_GFXCLK), nullptr, nullptr, 0);
+    }
+    else
+        structured_key_counter--;
+    // Validates 'MCLK' is in the structure
+    if (txt_power_dev_od_voltage.contains_structured_key(KTAG_MCLK,
+                                                        KTAG_FIRST_FREQ_IDX)) {
+        p->curr_mclk_range.lower_bound = freq_string_to_int(build_lower_bound(KTAG_MCLK), nullptr, nullptr, 0);
+        p->curr_mclk_range.upper_bound = freq_string_to_int(build_upper_bound(KTAG_MCLK), nullptr, nullptr, 0);
+    }
+    else
+        structured_key_counter--;
+  if (structured_key_counter == 0) {
       return RSMI_STATUS_NOT_YET_IMPLEMENTED;
   }
 
@@ -1450,7 +1566,20 @@ rsmi_status_t rsmi_dev_clk_range_set(uint32_t dv_ind, uint64_t minclkvalue,
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
 
-  assert(minclkvalue < maxclkvalue);
+  if (minclkvalue >= maxclkvalue) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
+
+  // Bare Metal only feature
+  if (amd::smi::is_vm_guest()) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
+
+  // Can only set the clock type for sys and mem type
+  if (clkType != RSMI_CLK_TYPE_SYS && clkType != RSMI_CLK_TYPE_MEM) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
+
   std::string min_sysvalue;
   std::string max_sysvalue;
   std::map<rsmi_clk_type_t, std::string> clk_char_map = {
@@ -1848,6 +1977,11 @@ rsmi_dev_gpu_clk_freq_set(uint32_t dv_ind,
     return RSMI_STATUS_INVALID_ARGS;
   }
 
+  // Bare Metal only feature
+  if (amd::smi::is_vm_guest()) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
+
   ret = rsmi_dev_gpu_clk_freq_get(dv_ind, clk_type, &freqs);
 
   if (ret != RSMI_STATUS_SUCCESS) {
@@ -1893,7 +2027,7 @@ rsmi_dev_gpu_clk_freq_set(uint32_t dv_ind,
   // will have read-only perms, and the OS will deny access, before the request hits the driver level
   if (status == RSMI_STATUS_PERMISSION){
     bool read_only = false;
-    int perms = amd::smi::isReadOnlyForAll(dev->path(), &read_only);
+    amd::smi::isReadOnlyForAll(dev->path(), &read_only);
     if(read_only){
       return RSMI_STATUS_NOT_SUPPORTED;
     }
@@ -1903,6 +2037,7 @@ rsmi_dev_gpu_clk_freq_set(uint32_t dv_ind,
 
   CATCH
 }
+
 static std::vector<std::string> pci_name_files = {
   "/usr/share/misc/pci.ids",
   "/usr/share/hwdata/pci.ids",
@@ -2184,17 +2319,17 @@ rsmi_dev_name_get(uint32_t dv_ind, char *name, size_t len) {
   std::ostringstream ss;
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
-  CHK_SUPPORT_NAME_ONLY(name)
 
-  if (len == 0) {
+  if (len == 0 || !name) {
     return RSMI_STATUS_INVALID_ARGS;
   }
+  CHK_SUPPORT_NAME_ONLY(name)
 
   DEVICE_MUTEX
 
   ret = get_dev_name_from_file(dv_ind, name, len);
 
-  if (ret || name[0] == '\0' || !isprint(name[0]) ) {
+  if (ret || name[0] == '\0' || !isprint(name[0])) {
     ret = get_dev_name_from_id(dv_ind, name, len, NAME_STR_DEVICE);
   }
 
@@ -2327,12 +2462,12 @@ rsmi_dev_vendor_name_get(uint32_t dv_ind, char *name, size_t len) {
   std::ostringstream ss;
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
+  if (name == nullptr || len == 0) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
   CHK_SUPPORT_NAME_ONLY(name)
 
   assert(len > 0);
-  if (len == 0) {
-    return RSMI_STATUS_INVALID_ARGS;
-  }
 
   DEVICE_MUTEX
   ret = get_dev_name_from_id(dv_ind, name, len, NAME_STR_VENDOR);
@@ -2470,25 +2605,25 @@ rsmi_dev_pci_bandwidth_get(uint32_t dv_ind, rsmi_pcie_bandwidth_t *b) {
     return ret;
   }
 
-  // Hardcode based on PCIe specification: https://en.wikipedia.org/wiki/PCI_Express
+  // Hardcode based on PCIe specification: search PCI_Express on wikipedia
   const uint32_t link_width[] = {1, 2, 4, 8, 12, 16};
   const uint32_t link_speed[] = {25, 50, 80, 160};  // 0.1 Ghz
   const uint32_t WIDTH_DATA_LENGTH = sizeof(link_width)/sizeof(uint32_t);
   const uint32_t SPEED_DATA_LENGTH = sizeof(link_speed)/sizeof(uint32_t);
 
   // Calculate the index
-  uint32_t width_index = -1;
-  uint32_t speed_index = -1;
+  int32_t width_index = -1;
+  int32_t speed_index = -1;
   uint32_t cur_index = 0;
   for (cur_index = 0; cur_index < WIDTH_DATA_LENGTH; cur_index++) {
     if (link_width[cur_index] == gpu_metrics.pcie_link_width) {
-      width_index = cur_index;
+      width_index = static_cast<int32_t>(cur_index);
       break;
     }
   }
   for (cur_index = 0; cur_index < SPEED_DATA_LENGTH; cur_index++) {
     if (link_speed[cur_index] == gpu_metrics.pcie_link_speed) {
-      speed_index = cur_index;
+      speed_index = static_cast<int32_t>(cur_index);
       break;
     }
   }
@@ -2497,7 +2632,7 @@ rsmi_dev_pci_bandwidth_get(uint32_t dv_ind, rsmi_pcie_bandwidth_t *b) {
   }
   // Set possible lanes and frequencies
   b->transfer_rate.num_supported = WIDTH_DATA_LENGTH * SPEED_DATA_LENGTH;
-  b->transfer_rate.current = speed_index*WIDTH_DATA_LENGTH + width_index;
+  b->transfer_rate.current = static_cast<uint32_t>(speed_index)*WIDTH_DATA_LENGTH + static_cast<uint32_t>(width_index);
   for (cur_index = 0; cur_index < WIDTH_DATA_LENGTH * SPEED_DATA_LENGTH; cur_index++) {
     b->transfer_rate.frequency[cur_index] =
       static_cast<long>(link_speed[cur_index/WIDTH_DATA_LENGTH]) * 100 * 1000000L;
@@ -2530,6 +2665,10 @@ rsmi_dev_pci_bandwidth_set(uint32_t dv_ind, uint64_t bw_bitmask) {
   LOG_TRACE(ss);
   REQUIRE_ROOT_ACCESS
   DEVICE_MUTEX
+  // Bare Metal only feature
+  if (amd::smi::is_vm_guest()) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
   ret = rsmi_dev_pci_bandwidth_get(dv_ind, &bws);
 
   if (ret != RSMI_STATUS_SUCCESS) {
@@ -2557,7 +2696,10 @@ rsmi_dev_pci_bandwidth_set(uint32_t dv_ind, uint64_t bw_bitmask) {
 
   int32_t ret_i;
   ret_i = dev->writeDevInfo(amd::smi::kDevPCIEClk, freq_enable_str);
-
+  //
+  // NOTE:  kDevPCIEClk sysfs file maybe not exist for all cases.
+  //        If it doesn't exist (pp_dpm_pcie), it shouldn't be an error
+  //        and will get translated to RSMI_STATUS_NOT_SUPPORTED.
   return amd::smi::ErrnoToRsmiStatus(ret_i);
 
   CATCH
@@ -2598,6 +2740,10 @@ rsmi_dev_pci_throughput_get(uint32_t dv_ind, uint64_t *sent,
     fs_rng >> *max_pkt_sz;
   }
 
+  if ((sent && *sent == UINT64_MAX) || (received && *received == UINT64_MAX)){
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
+
   return RSMI_STATUS_SUCCESS;
   CATCH
 }
@@ -2908,6 +3054,11 @@ rsmi_dev_fan_speed_set(uint32_t dv_ind, uint32_t sensor_ind, uint64_t speed) {
   REQUIRE_ROOT_ACCESS
   DEVICE_MUTEX
 
+  // Bare Metal only feature
+  if (amd::smi::is_vm_guest()) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
+
   ret = rsmi_dev_fan_speed_max_get(dv_ind, sensor_ind, &max_speed);
 
   if (ret != RSMI_STATUS_SUCCESS) {
@@ -2974,13 +3125,17 @@ rsmi_dev_gpu_reset(uint32_t dv_ind) {
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
   REQUIRE_ROOT_ACCESS
-  DEVICE_MUTEX
+  // No longer using DEVICE_MUTEX as it blocks long running processes
+  // DEVICE_MUTEX
 
   rsmi_status_t ret;
   uint64_t status_code = 0;
 
   // Read amdgpu_gpu_recover to reset it
   ret = get_dev_value_int(amd::smi::kDevGpuReset, dv_ind, &status_code);
+  ss << __PRETTY_FUNCTION__ << " | ======= end ======= | returning "
+     << getRSMIStatusString(ret, false);
+  LOG_INFO(ss);
   return ret;
 
   CATCH
@@ -3235,6 +3390,9 @@ rsmi_dev_power_cap_get(uint32_t dv_ind, uint32_t sensor_ind, uint64_t *cap) {
   LOG_TRACE(ss);
 
   ++sensor_ind;  // power sysfs files have 1-based indices
+  if (!cap) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
   CHK_SUPPORT_SUBVAR_ONLY(cap, sensor_ind)
 
   rsmi_status_t ret;
@@ -3255,6 +3413,9 @@ rsmi_dev_power_cap_range_get(uint32_t dv_ind, uint32_t sensor_ind,
   LOG_TRACE(ss);
 
   ++sensor_ind;  // power sysfs files have 1-based indices
+  if (max == nullptr || min == nullptr) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
   CHK_SUPPORT_SUBVAR_ONLY((min == nullptr || max == nullptr ?nullptr : min),
                                                                    sensor_ind)
   rsmi_status_t ret;
@@ -3283,6 +3444,11 @@ rsmi_dev_power_cap_set(uint32_t dv_ind, uint32_t sensor_ind, uint64_t cap) {
   REQUIRE_ROOT_ACCESS
   DEVICE_MUTEX
 
+  // Bare Metal only feature
+  if (amd::smi::is_vm_guest()) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
+
   ret = rsmi_dev_power_cap_range_get(dv_ind, sensor_ind, &max, &min);
   if (ret != RSMI_STATUS_SUCCESS) {
     return ret;
@@ -3332,6 +3498,10 @@ rsmi_dev_power_profile_set(uint32_t dv_ind, uint32_t dummy,
 
   (void)dummy;
   DEVICE_MUTEX
+  // Bare Metal only feature
+  if (amd::smi::is_vm_guest()) {
+    return RSMI_STATUS_NOT_SUPPORTED;
+  }
   rsmi_status_t ret = set_power_profile(dv_ind, profile);
 
   return ret;
@@ -3369,6 +3539,8 @@ rsmi_dev_memory_total_get(uint32_t dv_ind, rsmi_memory_type_t mem_type,
   }
 
   DEVICE_MUTEX
+  *total = 0;  // Initialize total to 0
+  // This is needed to avoid returning garbage value in case of failure
   ret = get_dev_value_int(mem_type_file, dv_ind, total);
 
   // Fallback to KFD reported memory if VRAM total is 0
@@ -3396,6 +3568,7 @@ rsmi_dev_memory_total_get(uint32_t dv_ind, rsmi_memory_type_t mem_type,
   return ret;
   CATCH
 }
+
 rsmi_status_t
 rsmi_dev_memory_usage_get(uint32_t dv_ind, rsmi_memory_type_t mem_type,
                                                               uint64_t *used) {
@@ -3427,6 +3600,8 @@ rsmi_dev_memory_usage_get(uint32_t dv_ind, rsmi_memory_type_t mem_type,
   }
 
   DEVICE_MUTEX
+  *used = 0;  // Initialize used to 0
+  // This is needed to avoid returning garbage value in case of failure
   ret = get_dev_value_int(mem_type_file, dv_ind, used);
 
   // Fallback to KFD reported memory if no VRAM
@@ -3613,6 +3788,19 @@ rsmi_status_string(rsmi_status_t status, const char **status_string) {
                        "the call from completing successfully";
       break;
 
+    case RSMI_STATUS_DRM_ERROR:
+      *status_string = "RSMI_STATUS_DRM_ERROR: An error occurred when calling "
+                       "libdrm";
+      break;
+    case RSMI_STATUS_FAIL_LOAD_MODULE:
+      *status_string = "RSMI_STATUS_FAIL_LOAD_MODULE: Failed to load the "
+                       "required module";
+      break;
+    case RSMI_STATUS_FAIL_LOAD_SYMBOL:
+      *status_string = "RSMI_STATUS_FAIL_LOAD_SYMBOL: Failed to load the "
+                       "required symbol";
+      break;
+
     default:
       *status_string = "RSMI_STATUS_UNKNOWN_ERROR: An unknown error occurred";
       return RSMI_STATUS_UNKNOWN_ERROR;
@@ -3964,10 +4152,8 @@ rsmi_dev_unique_id_get(uint32_t dv_ind, uint64_t *unique_id) {
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
 
-  CHK_SUPPORT_NAME_ONLY(unique_id)
-
   DEVICE_MUTEX
-  if (unique_id == nullptr) {
+  if (!unique_id) {
     return RSMI_STATUS_INVALID_ARGS;
   }
   *unique_id = std::numeric_limits<uint64_t>::max();
@@ -4134,14 +4320,17 @@ rsmi_counter_available_counters_get(uint32_t dv_ind,
   TRY
   CHK_SUPPORT_VAR(available, grp)
   DEVICE_MUTEX
-  uint64_t val;
+  uint64_t val = 0;
 
   switch (grp) {
     case RSMI_EVNT_GRP_XGMI:
     case RSMI_EVNT_GRP_XGMI_DATA_OUT:
 
       ret = get_dev_value_int(amd::smi::kDevDFCountersAvailable, dv_ind, &val);
-      assert(val < UINT32_MAX);
+      if (ret != RSMI_STATUS_SUCCESS)
+        return ret;
+      if (val == UINT32_MAX)
+        return RSMI_STATUS_NOT_SUPPORTED;
       *available = static_cast<uint32_t>(val);
       break;
 
@@ -5009,6 +5198,61 @@ rsmi_dev_compute_partition_set(uint32_t dv_ind,
   CATCH
 }
 
+rsmi_status_t rsmi_dev_compute_partition_capabilities_get(
+      uint32_t dv_ind, char *compute_partition_caps, uint32_t len) {
+  TRY
+  std::ostringstream ss;
+  ss << __PRETTY_FUNCTION__ << " | ======= start =======, " << dv_ind;
+  LOG_TRACE(ss);
+  DEVICE_MUTEX
+  std::string availableComputePartitions;
+  rsmi_status_t ret =
+      get_dev_value_line(amd::smi::kDevAvailableComputePartition,
+                         dv_ind, &availableComputePartitions);
+  if (ret != RSMI_STATUS_SUCCESS) {
+    ss << __PRETTY_FUNCTION__
+       << " | ======= end ======= "
+       << " | FAIL "
+       << " | Device #: " << dv_ind
+       << " | Type: "
+       << amd::smi::Device::get_type_string(amd::smi::kDevAvailableComputePartition)
+       << " | Data: could not retrieve requested data"
+       << " | Returning = "
+       << getRSMIStatusString(ret) << " |";
+    LOG_ERROR(ss);
+    return ret;
+  }
+
+  std::size_t length = availableComputePartitions.copy(compute_partition_caps, len-1);
+  compute_partition_caps[length]='\0';
+
+  if (len < (availableComputePartitions.size() + 1)) {
+    ss << __PRETTY_FUNCTION__
+       << " | ======= end ======= "
+       << " | Fail "
+       << " | Device #: " << dv_ind
+       << " | Type: "
+       << amd::smi::Device::get_type_string(amd::smi::kDevAvailableComputePartition)
+       << " | Cause: requested size was insufficient"
+       << " | Returning = "
+       << getRSMIStatusString(RSMI_STATUS_INSUFFICIENT_SIZE) << " |";
+    LOG_ERROR(ss);
+    return RSMI_STATUS_INSUFFICIENT_SIZE;
+  }
+  ss << __PRETTY_FUNCTION__
+     << " | ======= end ======= "
+     << " | Success "
+     << " | Device #: " << dv_ind
+     << " | Type: "
+     << amd::smi::Device::get_type_string(amd::smi::kDevAvailableComputePartition)
+     << " | Data: " << compute_partition_caps
+     << " | Returning = "
+     << getRSMIStatusString(ret) << " |";
+  LOG_TRACE(ss);
+  return ret;
+  CATCH
+}
+
 static rsmi_status_t get_memory_partition(uint32_t dv_ind,
                                           std::string &memory_partition) {
   TRY
@@ -5054,10 +5298,6 @@ rsmi_dev_memory_partition_set(uint32_t dv_ind,
   REQUIRE_ROOT_ACCESS
   DEVICE_MUTEX
   const int k1000_MS_WAIT = 1000;
-  const uint32_t kMaxBoardLength = 128;
-  bool isCorrectDevice = false;
-  char boardName[kMaxBoardLength];
-  boardName[0] = '\0';
 
   const uint32_t kMaxMemoryCapabilitiesSize = 30;
   char available_memory_capabilities[kMaxMemoryCapabilitiesSize];
@@ -5574,16 +5814,16 @@ rsmi_status_t rsmi_dev_node_id_get(uint32_t dv_ind, uint32_t *node_id) {
        << " | Device #: " << dv_ind;
     LOG_TRACE(ss);
     GET_DEV_AND_KFDNODE_FROM_INDX
-    uint32_t kgd_node_id = std::numeric_limits<uint32_t>::max();
+    uint32_t kfd_node_id = std::numeric_limits<uint32_t>::max();
     rsmi_status_t resp = RSMI_STATUS_NOT_SUPPORTED;
-    int ret = kfd_node->KFDNode::get_node_id(&kgd_node_id);
+    int ret = kfd_node->KFDNode::get_node_id(&kfd_node_id);
     resp = amd::smi::ErrnoToRsmiStatus(ret);
 
     if (node_id == nullptr) {
       resp = RSMI_STATUS_INVALID_ARGS;
     } else {
-      *node_id = kgd_node_id;
-      if (kgd_node_id == std::numeric_limits<uint32_t>::max()) {
+      *node_id = kfd_node_id;
+      if (kfd_node_id == std::numeric_limits<uint32_t>::max()) {
         resp = RSMI_STATUS_NOT_SUPPORTED;
       }
     }
@@ -5987,7 +6227,7 @@ rsmi_event_notification_get(int timeout_ms,
 
       uint32_t event;
       char event_in[MAX_EVENT_NOTIFICATION_MSG_SIZE];
-      memcpy(reinterpret_cast<char *>(event_in), "\0", MAX_EVENT_NOTIFICATION_MSG_SIZE);
+      memset(event_in, '\0', MAX_EVENT_NOTIFICATION_MSG_SIZE);
       while (fgets(event_in, MAX_EVENT_NOTIFICATION_MSG_SIZE, anon_fp)) {
         /* Output is in format as "event_number message_information\n"
          * Both event are expressed in hex.
@@ -6000,20 +6240,20 @@ rsmi_event_notification_get(int timeout_ms,
         // parse message based on event received
         switch (event){
           case RSMI_EVT_NOTIF_NONE:
-            strcpy(reinterpret_cast<char *>(&data_item->message), "Event type None received");
+            strncpy(reinterpret_cast<char *>(&data_item->message), "Event type None received", MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
             break;
           case RSMI_EVT_NOTIF_VMFAULT:
           {
             uint32_t pid;
             char task_name[MAX_EVENT_NOTIFICATION_MSG_SIZE];
-            memcpy(reinterpret_cast<char *>(task_name), "\0", MAX_EVENT_NOTIFICATION_MSG_SIZE);
+            memset(task_name, '\0', MAX_EVENT_NOTIFICATION_MSG_SIZE);
 
             sscanf(message, "%x:%s\n", &pid, task_name);
             std::stringstream final_message;
-            final_message << "pid: " << std::to_string(pid).c_str()
+            final_message << "PID: " << std::to_string(pid).c_str()
                           << "  task name: " << task_name;
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_THERMAL_THROTTLE:
@@ -6021,37 +6261,38 @@ rsmi_event_notification_get(int timeout_ms,
             uint64_t bitmask;
             uint64_t counter;
 
-            sscanf(message, "%llx:%llx\n", &bitmask, &counter);
+            sscanf(message, "%" PRIx64 ":%" PRIx64 "\n", &bitmask, &counter);
             std::stringstream final_message;
             final_message << "bitmask: 0x" << std::hex << bitmask
                           << "  counter: 0x" << std::hex << counter;
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_GPU_PRE_RESET:
           {
             uint32_t reset_seq_num;
             char reset_cause[MAX_EVENT_NOTIFICATION_MSG_SIZE];
-            memcpy(reinterpret_cast<char *>(reset_cause), "\0", MAX_EVENT_NOTIFICATION_MSG_SIZE);
+            memset(reset_cause, '\0', MAX_EVENT_NOTIFICATION_MSG_SIZE);
 
             sscanf(message, "%x %[^\n]\n", &reset_seq_num, reset_cause);
             std::stringstream final_message;
             final_message << "reset sequence number: " << std::to_string(reset_seq_num).c_str()
                           << "  reset cause: " << reset_cause;
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_GPU_POST_RESET:
           {
             uint32_t reset_seq_num;
 
-            sscanf(message, "%x %[^\n]\n", &reset_seq_num);
+            char tmp[MAX_EVENT_NOTIFICATION_MSG_SIZE];
+            sscanf(message, "%x %[^\n]\n", &reset_seq_num, tmp);
             std::stringstream final_message;
-            final_message << "  reset sequence number: " << std::to_string(reset_seq_num).c_str();
+            final_message << "reset sequence number: " << std::to_string(reset_seq_num).c_str();
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_EVENT_MIGRATE_START:
@@ -6060,15 +6301,15 @@ rsmi_event_notification_get(int timeout_ms,
             int32_t pid;
             uint32_t start;
             uint32_t size;
-            uint16_t from;
-            uint16_t to;
-            uint16_t prefetch_loc;
-            uint16_t preferred_loc;
+            uint32_t from;
+            uint32_t to;
+            uint32_t prefetch_loc;
+            uint32_t preferred_loc;
             int32_t migrate_trigger;
 
-            sscanf(message, "%lld -%d @%lx(%lx) %x->%x %x:%x %d\n", &ns, &pid, &start, &size, &from, &to, &prefetch_loc, &preferred_loc, &migrate_trigger);
+            sscanf(message, "%" PRId64 " -%d @%" PRIu32 "(%" PRIu32 ") %x->%x %x:%x %d\n", &ns, &pid, &start, &size, &from, &to, &prefetch_loc, &preferred_loc, &migrate_trigger);
             std::stringstream final_message;
-            final_message << "ns: " << std::to_string(ns).c_str() 
+            final_message << "nd: " << std::to_string(ns).c_str() 
                           << "  pid: " << std::to_string(pid).c_str()
                           << "  start: 0x" << std::hex << start
                           << "  size: 0x" << std::hex << size
@@ -6078,7 +6319,7 @@ rsmi_event_notification_get(int timeout_ms,
                           << "  preferred_loc: 0x" << std::hex << preferred_loc
                           << "  migrate_trigger: " << std::to_string(migrate_trigger).c_str();
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_EVENT_MIGRATE_END:
@@ -6092,9 +6333,9 @@ rsmi_event_notification_get(int timeout_ms,
             uint32_t migrate_trigger;
             uint32_t error_code;
 
-            sscanf(message, "%lld -%d @%lx(%lx) %x->%x %d %d\n", &ns, &pid, &start, &size, &from, &to, &migrate_trigger, &error_code);
+            sscanf(message, "%" PRId64 " -%d @%" PRIu32 "(%" PRIu32 ") %x->%x %d %d\n", &ns, &pid, &start, &size, &from, &to, &migrate_trigger, &error_code);
             std::stringstream final_message;
-            final_message << "ns: " << std::to_string(ns).c_str() 
+            final_message << "nd: " << std::to_string(ns).c_str() 
                           << "  pid: " << std::to_string(pid).c_str()
                           << "  start: 0x" << std::hex << start
                           << "  size: 0x" << std::hex << size
@@ -6103,7 +6344,7 @@ rsmi_event_notification_get(int timeout_ms,
                           << "  migrate_trigger: " << std::to_string(migrate_trigger).c_str()
                           << "  error_code: " << std::to_string(error_code).c_str();
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_EVENT_PAGE_FAULT_START:
@@ -6112,9 +6353,9 @@ rsmi_event_notification_get(int timeout_ms,
             int32_t pid;
             uint32_t addr;
             uint32_t node;
-            char *rw;
+            char *rw = "\0";
 
-            sscanf(message, "%lld -%d @%lx(%x) %c\n", &ns, &pid, &addr, &node, rw);
+            sscanf(message, "%" PRId64 " -%d @%" PRIx32 "(%x) %c\n", &ns, &pid, &addr, &node, rw);
             std::stringstream final_message;
             final_message << "ns: " << std::to_string(ns).c_str()
                           << "  pid: " << std::to_string(pid).c_str()
@@ -6122,7 +6363,7 @@ rsmi_event_notification_get(int timeout_ms,
                           << "  node: 0x" << std::hex << node
                           << "  rw: " << rw;
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_EVENT_PAGE_FAULT_END:
@@ -6131,9 +6372,9 @@ rsmi_event_notification_get(int timeout_ms,
             int32_t pid;
             uint32_t addr;
             uint32_t node;
-            char *migrate_update;
+            char *migrate_update = "\0";
 
-            sscanf(message, "%lld -%d @%lx(%x) %c\n", &ns, &pid, &addr, &node, migrate_update);
+            sscanf(message, "%" PRId64 " -%d @%" PRIx32 "(%x) %c\n", &ns, &pid, &addr, &node, migrate_update);
             std::stringstream final_message;
             final_message << "ns: " << std::to_string(ns).c_str()
                           << "  pid: " << std::to_string(pid).c_str()
@@ -6141,7 +6382,7 @@ rsmi_event_notification_get(int timeout_ms,
                           << "  node: 0x" << std::hex << node
                           << "  migrate_udpate: " << migrate_update;
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_EVENT_QUEUE_EVICTION:
@@ -6151,14 +6392,14 @@ rsmi_event_notification_get(int timeout_ms,
             uint32_t node;
             uint32_t evict_trigger;
 
-            sscanf(message, "%lld -%d %x %d\n", &ns, &pid, &node, &evict_trigger);
+            sscanf(message, "%" PRId64 "-%d %x %d\n", &ns, &pid, &node, &evict_trigger);
             std::stringstream final_message;
             final_message << "ns: " << std::to_string(ns).c_str()
                           << "  pid: " << std::to_string(pid).c_str()
                           << "  node: 0x" << std::hex << node
                           << "  evict_trigger: " << std::to_string(evict_trigger).c_str();
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_EVENT_QUEUE_RESTORE:
@@ -6166,16 +6407,16 @@ rsmi_event_notification_get(int timeout_ms,
             int64_t ns;
             int32_t pid;
             uint32_t node;
-            char *rescheduled;
+            char *rescheduled = "\0";
 
-            sscanf(message, "%lld -%d %x %c\n", &ns, &pid, &node, rescheduled);
+            sscanf(message, "%" PRId64 "-%d %x %c\n", &ns, &pid, &node, rescheduled);
             std::stringstream final_message;
             final_message << "ns: " << std::to_string(ns).c_str()
                           << "  pid: " << std::to_string(pid).c_str()
                           << "  node: 0x" << std::hex << node
                           << "  rescheduled: " << rescheduled;
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           case RSMI_EVT_NOTIF_EVENT_UNMAP_FROM_GPU:
@@ -6187,7 +6428,7 @@ rsmi_event_notification_get(int timeout_ms,
             uint32_t node;
             uint32_t unmap_trigger;
 
-            sscanf(message, "%lld -%d @%lx(%lx) %x %d\n", &ns, &pid, &addr, &size, &node, &unmap_trigger);
+            sscanf(message, "%" PRId64 " -%d @%" PRIx32 "(%" PRIx32 ") %x %d\n", &ns, &pid, &addr, &size, &node, &unmap_trigger);
             std::stringstream final_message;
             final_message << "ns: " << std::to_string(ns).c_str()
                           << "  pid: " << std::to_string(pid).c_str()
@@ -6196,11 +6437,11 @@ rsmi_event_notification_get(int timeout_ms,
                           << "  node: 0x" << std::hex << node
                           << "  unmap_trigger: " << std::to_string(unmap_trigger).c_str();
 
-            strcpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str());
+            strncpy(reinterpret_cast<char *>(&data_item->message), final_message.str().c_str(), MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
           }
           break;
           default:
-            strcpy(reinterpret_cast<char *>(&data_item->message), "Unknown event received");
+            strncpy(reinterpret_cast<char *>(&data_item->message), "Unknown event received", MAX_EVENT_NOTIFICATION_MSG_SIZE-1);
             break;
         }
         data_item->event = (rsmi_evt_notification_type_t)event;
@@ -6208,7 +6449,7 @@ rsmi_event_notification_get(int timeout_ms,
         ++(*num_elem);
 
         // zero out event_in after each use
-        memcpy(reinterpret_cast<char *>(event_in), "\0", MAX_EVENT_NOTIFICATION_MSG_SIZE);
+        memset(event_in, '\0', MAX_EVENT_NOTIFICATION_MSG_SIZE);
 
         if (*num_elem >= buffer_size) {
           break;
diff --git a/src/rocm_smi64Config.in b/src/rocm_smi64Config.in
old mode 100755
new mode 100644
index a3b2631..e3c5903
--- a/src/rocm_smi64Config.in
+++ b/src/rocm_smi64Config.in
@@ -5,7 +5,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/src/rocm_smi_counters.cc b/src/rocm_smi_counters.cc
old mode 100755
new mode 100644
index a088195..185ed0e
--- a/src/rocm_smi_counters.cc
+++ b/src/rocm_smi_counters.cc
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2019, Advanced Micro Devices, Inc.
+ * Copyright (c) 2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
diff --git a/src/rocm_smi_device.cc b/src/rocm_smi_device.cc
old mode 100755
new mode 100644
index 62ced13..cf8cbf7
--- a/src/rocm_smi_device.cc
+++ b/src/rocm_smi_device.cc
@@ -3,7 +3,7 @@
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
  *
- * Copyright (c) 2017-2023, Advanced Micro Devices, Inc.
+ * Copyright (c) 2017-2025, Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Developed by:
@@ -509,10 +509,12 @@ static const std::map<const char *, dev_depends_t> kDevFuncDependsMap = {
   {"rsmi_dev_counter_create",            {{}, {}}},
   {"rsmi_dev_xgmi_error_status",         {{kDevXGMIErrorFName}, {}}},
   {"rsmi_dev_xgmi_error_reset",          {{kDevXGMIErrorFName}, {}}},
-  {"rsmi_dev_memory_reserved_pages_get", {{kDevMemPageBadFName}, {}}},
   {"rsmi_topo_numa_affinity_get",        {{kDevNumaNodeFName}, {}}},
   {"rsmi_dev_gpu_metrics_info_get",      {{kDevGpuMetricsFName}, {}}},
   {"rsmi_dev_gpu_reset",                 {{kDevGpuResetFName}, {}}},
+  {"rsmi_dev_energy_count_get",          {{kDevGpuMetricsFName}, {}}},
+  {"rsmi_dev_current_socket_power_get",  {{kDevGpuMetricsFName}, {}}},
+
   {"rsmi_dev_compute_partition_get",     {{kDevComputePartitionFName}, {}}},
   {"rsmi_dev_compute_partition_set",     {{kDevComputePartitionFName}, {}}},
   {"rsmi_dev_memory_partition_get",      {{kDevMemoryPartitionFName}, {}}},
@@ -763,8 +765,8 @@ int Device::readDebugInfoStr(DevInfoTypes type, std::string *retStr) {
   ret = openDebugFileStream(type, &fs);
   if (ret != 0) {
     ss << "Could not read debugInfoStr for DevInfoType ("
-     << get_type_string(type) << "), returning "
-     << std::to_string(ret);
+       << get_type_string(type) << "), returning "
+       << std::to_string(ret);
     LOG_ERROR(ss);
     return ret;
   }
@@ -960,7 +962,7 @@ int Device::readDevInfoLine(DevInfoTypes type, std::string *line) {
      << get_type_string(type) << "), returning *line = "
      << *line;
   LOG_INFO(ss);
-
+  fs.close();
   return 0;
 }
 
@@ -1042,6 +1044,7 @@ int Device::readDevInfoMultiLineStr(DevInfoTypes type,
   while (std::getline(fs, line)) {
     retVec->push_back(line);
   }
+  fs.close();
 
   if (retVec->empty()) {
     ss << "Read devInfoMultiLineStr for DevInfoType ("
@@ -1422,7 +1425,6 @@ rsmi_status_t Device::restartAMDGpuDriver(void) {
   bool success = false;
   std::string out;
   bool wasGdmServiceActive = false;
-  bool restartInProgress = true;
   bool isRestartInProgress = true;
   bool isAMDGPUModuleLive = false;
   bool restartGDM = false;
@@ -1508,7 +1510,6 @@ rsmi_status_t Device::isRestartInProgress(bool *isRestartInProgress,
                                           bool *isAMDGPUModuleLive) {
   REQUIRE_ROOT_ACCESS
   std::ostringstream ss;
-  bool restartSuccessful = true;
   bool success = false;
   std::string out;
   bool deviceRestartInProgress = true;    // Assume in progress, we intend to disprove
@@ -1718,3 +1719,4 @@ rsmi_status_t Device::get_smi_device_identifiers(uint32_t device_id,
 #undef RET_IF_NONZERO
 }  // namespace smi
 }  // namespace amd
+
diff --git a/src/rocm_smi_gpu_metrics.cc b/src/rocm_smi_gpu_metrics.cc
old mode 100755
new mode 100644
index 5962477..0722f89
--- a/src/rocm_smi_gpu_metrics.cc
+++ b/src/rocm_smi_gpu_metrics.cc
@@ -1,44 +1,23 @@
 /*
- * =============================================================================
- * The University of Illinois/NCSA
- * Open Source License (NCSA)
- *
- * Copyright (c) 2017-2024, Advanced Micro Devices, Inc.
- * All rights reserved.
- *
- * Developed by:
- *
- *                 AMD Research and AMD ROC Software Development
- *
- *                 Advanced Micro Devices, Inc.
- *
- *                 www.amd.com
+ * Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal with the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  - Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimers.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimers in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the names of <Name of Development Group, Name of Institution>,
- *    nor the names of its contributors may be used to endorse or promote
- *    products derived from this Software without specific prior written
- *    permission.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS WITH THE SOFTWARE.
- *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include "rocm_smi/rocm_smi_gpu_metrics.h"
@@ -52,6 +31,7 @@
 
 #include <dirent.h>
 #include <pthread.h>
+#include <unistd.h>
 
 #include <algorithm>
 #include <array>
@@ -84,7 +64,7 @@ namespace amd::smi
 
 constexpr uint16_t join_metrics_version(uint8_t format_rev, uint8_t content_rev)
 {
-  return (format_rev << 8 | content_rev);
+  return static_cast<uint16_t>((format_rev << 8 | content_rev));
 }
 
 constexpr uint16_t join_metrics_version(const AMDGpuMetricsHeader_v1_t& metrics_header)
@@ -168,6 +148,7 @@ const AMDGpuMetricVersionTranslationTbl_t amdgpu_metric_version_translation_tabl
   {join_metrics_version(1, 5), AMDGpuMetricVersionFlags_t::kGpuMetricV15},
   {join_metrics_version(1, 6), AMDGpuMetricVersionFlags_t::kGpuMetricV16},
   {join_metrics_version(1, 7), AMDGpuMetricVersionFlags_t::kGpuMetricV17},
+  {join_metrics_version(1, 8), AMDGpuMetricVersionFlags_t::kGpuMetricV18},
 };
 
 /**
@@ -277,22 +258,27 @@ const AMDGpuMetricsUnitTypeTranslationTbl_t amdgpu_metrics_unit_type_translation
   {AMDGpuMetricsUnitType_t::kMetricHBMThmResidencyAccumulator, "HBMThmResidencyAccumulator"},       /* v1.6 */
 
   // kGpuMetricPartition
-  {AMDGpuMetricsUnitType_t::kGpuMetricNumPartition, "numPartition"},  /* v1.6 */
+  {AMDGpuMetricsUnitType_t::kGpuMetricNumPartition, "numPartition"},                                /* v1.6 */
 
   // kGpuMetricXcpStats
-  {AMDGpuMetricsUnitType_t::kMetricGfxBusyInst, "GfxBusyInst"},       /* v1.6 */
-  {AMDGpuMetricsUnitType_t::kMetricJpegBusy, "JpegBusy"},             /* v1.6 */
-  {AMDGpuMetricsUnitType_t::kMetricVcnBusy, "VcnBusy"},               /* v1.6 */
-  {AMDGpuMetricsUnitType_t::kMetricGfxBusyAcc, "GfxBusyAcc"},         /* v1.6 */
+  {AMDGpuMetricsUnitType_t::kMetricGfxBusyInst, "GfxBusyInst"},                                     /* v1.6 */
+  {AMDGpuMetricsUnitType_t::kMetricJpegBusy, "JpegBusy"},                                           /* v1.6 */
+  {AMDGpuMetricsUnitType_t::kMetricVcnBusy, "VcnBusy"},                                             /* v1.6 */
+  {AMDGpuMetricsUnitType_t::kMetricGfxBusyAcc, "GfxBusyAcc"},                                       /* v1.6 */
 
   // kGpuMetricLinkWidthSpeed
-  {AMDGpuMetricsUnitType_t::kMetricPcieLCPerfOtherEndRecov, "PcieLCPerfOtherEndRecov"},   /* v1.6 */
+  {AMDGpuMetricsUnitType_t::kMetricPcieLCPerfOtherEndRecov, "PcieLCPerfOtherEndRecov"},             /* v1.6 */
+
 
+  {AMDGpuMetricsUnitType_t::kMetricXgmiLinkStatus, "XgmiLinkStatus"},                               /* v1.7 */
+  {AMDGpuMetricsUnitType_t::kMetricVramMaxBandwidth, "VramMaxBandwidth"},                           /* v1.7 */
+  {AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitAccumulator,"GfxBelowHostLimitAccumulator"},    /* v1.7 */
 
-  {AMDGpuMetricsUnitType_t::kMetricXgmiLinkStatus, "XgmiLinkStatus"},           /* v1.7 */
-  {AMDGpuMetricsUnitType_t::kMetricVramMaxBandwidth, "VramMaxBandwidth"},       /* v1.7 */
-  {AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitAccumulator,
-    "GfxBelowHostLimitAccumulator"},  /* v1.7 */
+  // kGpuMetricXcpStats v1.8
+  {AMDGpuMetricsUnitType_t::kMetricGfxLowUtilitizationAcc, "GfxLowUtilitizationAcc"},               /* v1.8 */
+  {AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitTotalAcc, "GfxBelowHostLimitTotalAcc"},         /* v1.8 */
+  {AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitPptAcc, "GfxBelowHostLimitPptAcc"},             /* v1.8 */
+  {AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitThmAcc, "GfxBelowHostLimitThmAcc"},             /* v1.8 */
 };
 
 
@@ -382,6 +368,7 @@ AMDGpuMetricFactories_t amd_gpu_metrics_factory_table
   {AMDGpuMetricVersionFlags_t::kGpuMetricV15, std::make_shared<GpuMetricsBase_v15_t>(GpuMetricsBase_v15_t{})},
   {AMDGpuMetricVersionFlags_t::kGpuMetricV16, std::make_shared<GpuMetricsBase_v16_t>(GpuMetricsBase_v16_t{})},
   {AMDGpuMetricVersionFlags_t::kGpuMetricV17, std::make_shared<GpuMetricsBase_v17_t>(GpuMetricsBase_v17_t{})},
+  {AMDGpuMetricVersionFlags_t::kGpuMetricV18, std::make_shared<GpuMetricsBase_v18_t>(GpuMetricsBase_v18_t{})},
 };
 
 GpuMetricsBasePtr amdgpu_metrics_factory(AMDGpuMetricVersionFlags_t gpu_metric_version)
@@ -500,381 +487,269 @@ AMDGpuDynamicMetricTblValues_t format_metric_row(const T& metric, const std::str
   return multi_values;
 }
 
-void GpuMetricsBase_v17_t::dump_internal_metrics_table()
-{
-  std::ostringstream ss;
-  auto idx = uint64_t(0);
-  auto idy = uint64_t(0);
-  std::cout << __PRETTY_FUNCTION__ << " | ======= start ======= \n";
-  ss << __PRETTY_FUNCTION__
-     << " | ======= DEBUG ======= "
-     << " | Metric Version: "
-     << stringfy_metric_header_version(m_gpu_metrics_tbl.m_common_header)
-     << " | Size: "
-     << print_unsigned_int(m_gpu_metrics_tbl.m_common_header.m_structure_size)
-     << " |"
-     << "\n";
-  ss  << " temperature_hotspot: " << m_gpu_metrics_tbl.m_temperature_hotspot  << "\n"
-      << " temperature_mem: " << m_gpu_metrics_tbl.m_temperature_mem << "\n"
-      << " temperature_vrsoc: " << m_gpu_metrics_tbl.m_temperature_vrsoc << "\n"
-      << " current_socket_power: " << m_gpu_metrics_tbl.m_current_socket_power << "\n"
-      << " average_gfx_activity: " << m_gpu_metrics_tbl.m_average_gfx_activity << "\n"
-      << " average_umc_activity: " << m_gpu_metrics_tbl.m_average_umc_activity << "\n";
-
-  ss  << " vram_max_bandwidth: " << m_gpu_metrics_tbl.m_vram_max_bandwidth << "\n"  // new for v1.7
-      << " energy_accumulator: " << m_gpu_metrics_tbl.m_energy_accumulator << "\n"
-      << " system_clock_counter: " << m_gpu_metrics_tbl.m_system_clock_counter << "\n"
-      << " accumulation_counter: " << m_gpu_metrics_tbl.m_accumulation_counter << "\n"
-      << " prochot_residency_acc: " << m_gpu_metrics_tbl.m_prochot_residency_acc << "\n"
-      << " ppt_residency_acc: " << m_gpu_metrics_tbl.m_ppt_residency_acc << "\n"
-      << " socket_thm_residency_acc: " << m_gpu_metrics_tbl.m_socket_thm_residency_acc << "\n"
-      << " vr_thm_residency_acc: " << m_gpu_metrics_tbl.m_vr_thm_residency_acc << "\n"
-      << " hbm_thm_residency_acc: " << m_gpu_metrics_tbl.m_hbm_thm_residency_acc << "\n"
-      << " gfxclk_lock_status: " << m_gpu_metrics_tbl.m_gfxclk_lock_status << "\n"
-      << " pcie_link_width: " << m_gpu_metrics_tbl.m_pcie_link_width << "\n"
-      << " pcie_link_speed: " << m_gpu_metrics_tbl.m_pcie_link_speed << "\n"
-      << " xgmi_link_width: " << m_gpu_metrics_tbl.m_xgmi_link_width << "\n"
-      << " xgmi_link_speed: " << m_gpu_metrics_tbl.m_xgmi_link_speed << "\n"
-      << " gfx_activity_acc: " << m_gpu_metrics_tbl.m_gfx_activity_acc << "\n"
-      << " mem_activity_acc: " << m_gpu_metrics_tbl.m_mem_activity_acc << "\n"
-      << " pcie_bandwidth_acc: " << m_gpu_metrics_tbl.m_pcie_bandwidth_acc << "\n"
-      << " pcie_bandwidth_inst: " << m_gpu_metrics_tbl.m_pcie_bandwidth_inst << "\n"
-      << " pcie_l0_to_recov_count_acc: " << m_gpu_metrics_tbl.m_pcie_l0_to_recov_count_acc << "\n"
-      << " pcie_replay_count_acc: " << m_gpu_metrics_tbl.m_pcie_replay_count_acc << "\n"
-      << " pcie_replay_rover_count_acc: " << m_gpu_metrics_tbl.m_pcie_replay_rover_count_acc << "\n"
-      << " pcie_nak_sent_count_acc: " << m_gpu_metrics_tbl.m_pcie_nak_sent_count_acc << "\n"
-      << " pcie_nak_rcvd_count_acc: " << m_gpu_metrics_tbl.m_pcie_nak_rcvd_count_acc << "\n"
-      << " firmware_timestamp: " << m_gpu_metrics_tbl.m_firmware_timestamp << "\n"
-      << " current_uclk: " << m_gpu_metrics_tbl.m_current_uclk << "\n"
-      << " num_partition: " << m_gpu_metrics_tbl.m_num_partition << "\n"
-      << " pcie_lc_perf_other_end_recovery: "
-      << m_gpu_metrics_tbl.m_pcie_lc_perf_other_end_recovery << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_link_status) { // new for v1.7
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_read_data_acc) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " xgmi_write_data_acc: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_write_data_acc) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
 
-  ss  << " current_gfxclk: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_gfxclk) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+rsmi_status_t GpuMetricsBase_v18_t::populate_metrics_dynamic_tbl() {
+  std::ostringstream ss;
+  auto status_code(rsmi_status_t::RSMI_STATUS_SUCCESS);
+  ss << __PRETTY_FUNCTION__ << " | ======= start =======";
+  LOG_TRACE(ss);
 
-  ss  << " current_socclk: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_socclk) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+  auto m_metrics_dynamic_tbl = AMDGpuDynamicMetricsTbl_t{};
+  //
+  //  Note: Any metric treatment/changes (if any) should happen before they
+  //        get written to internal/external tables.
+  //
+  auto run_metric_adjustments_v18 = [&]() {
+    ss << __PRETTY_FUNCTION__ << " | ======= start =======";
+    const auto gpu_metrics_version =
+        translate_flag_to_metric_version(get_gpu_metrics_version_used());
+    ss << __PRETTY_FUNCTION__ << " | ======= info ======= "
+       << " | Applying adjustments "
+       << " | Metric Version: "
+       << stringfy_metric_header_version(disjoin_metrics_version(gpu_metrics_version)) << " |";
+    LOG_TRACE(ss);
 
-  ss  << " current_vclk0: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_vclk0) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+    // firmware_timestamp is at 10ns resolution
+    ss << __PRETTY_FUNCTION__ << " | ======= Changes ======= "
+       << " | {m_firmware_timestamp} from: " << m_gpu_metrics_tbl.m_firmware_timestamp
+       << " to: " << (m_gpu_metrics_tbl.m_firmware_timestamp * 10);
+    m_gpu_metrics_tbl.m_firmware_timestamp = (m_gpu_metrics_tbl.m_firmware_timestamp * 10);
+    LOG_DEBUG(ss);
+  };
 
-  ss  << " current_dclk0: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_dclk0) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+  run_metric_adjustments_v18();
 
-  idx = 0;
-  idy = 0;
-  ss  << " xcp_stats.gfx_busy_inst: " << "\n";
-  for (auto& row : m_gpu_metrics_tbl.m_xcp_stats) {
-    if (idx == 0) {
-      ss << "\t [ ";
-    }
-    for (auto& col : row.gfx_busy_inst) {
-      ss << "\t [" << idx << "] [" << idy << "]: " << col;
-      if (idy + 1 != (std::end(row.gfx_busy_inst) - std::end(row.gfx_busy_inst) - 1)) {
-        ss << ", ";
-      }
-      if (idx + 1 !=
-          (std::end(m_gpu_metrics_tbl.m_xcp_stats) - std::end(m_gpu_metrics_tbl.m_xcp_stats) - 1)) {
-        ss << "\n";
-      } else {
-        ss << "]\n";
-      }
-      idy++;
-    }
-    idx++;
-  }
+  // Temperature Info
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricTemperature]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricTempHotspot,
+              format_metric_row(m_gpu_metrics_tbl.m_temperature_hotspot,
+                               "temperature_hotspot")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricTemperature]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricTempMem,
+              format_metric_row(m_gpu_metrics_tbl.m_temperature_mem,
+                                "temperature_mem")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricTemperature]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricTempVrSoc,
+              format_metric_row(m_gpu_metrics_tbl.m_temperature_vrsoc,
+                                "temperature_vrsoc")));
 
-  idx = 0;
-  idy = 0;
-  ss  << " xcp_stats.vcn_busy: " << "\n";
-  for (auto& row : m_gpu_metrics_tbl.m_xcp_stats) {
-    if (idx == 0) {
-      ss << "\t [ ";
-    }
-    for (auto& col : row.vcn_busy) {
-      ss << "\t [" << idx << "] [" << idy << "]: " << col;
-      if (idy + 1 != (std::end(row.vcn_busy) - std::end(row.vcn_busy) - 1)) {
-        ss << ", ";
-      }
-      if (idx + 1 !=
-          (std::end(m_gpu_metrics_tbl.m_xcp_stats) - std::end(m_gpu_metrics_tbl.m_xcp_stats) - 1)) {
-        ss << "\n";
-      } else {
-        ss << "]\n";
-      }
-      idy++;
-    }
-    idx++;
-  }
+  // Power/Energy Info
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricPowerEnergy]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricCurrSocketPower,
+              format_metric_row(m_gpu_metrics_tbl.m_current_socket_power,
+                                "curr_socket_power")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricPowerEnergy]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricEnergyAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_energy_accumulator,
+                                "energy_acc")));
 
-  idx = 0;
-  idy = 0;
-  ss  << " xcp_stats.jpeg_busy: " << "\n";
-  for (auto& row : m_gpu_metrics_tbl.m_xcp_stats) {
-    if (idx == 0) {
-      ss << "\t [ ";
-    }
-    for (auto& col : row.jpeg_busy) {
-      ss << "\t [" << idx << "] [" << idy << "]: " << col;
-      if (idy + 1 != (std::end(row.jpeg_busy) - std::end(row.jpeg_busy) - 1)) {
-        ss << ", ";
-      }
-      if (idx + 1 !=
-          (std::end(m_gpu_metrics_tbl.m_xcp_stats) - std::end(m_gpu_metrics_tbl.m_xcp_stats) - 1)) {
-        ss << "\n";
-      } else {
-        ss << "]\n";
-      }
-      idy++;
-    }
-    idx++;
-  }
+  // Utilization Info
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricUtilization]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricAvgGfxActivity,
+              format_metric_row(m_gpu_metrics_tbl.m_average_gfx_activity,
+                                "average_gfx_activity")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricUtilization]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricAvgUmcActivity,
+              format_metric_row(m_gpu_metrics_tbl.m_average_umc_activity,
+                                "average_umc_activity")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricUtilization]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxActivityAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_gfx_activity_acc,
+                                "gfx_activity_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricUtilization]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricMemActivityAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_mem_activity_acc,
+                                "mem_activity_acc")));
 
-  idx = 0;
-  idy = 0;
-  ss  << " xcp_stats.gfx_busy_acc: " << "\n";
-  for (auto& row : m_gpu_metrics_tbl.m_xcp_stats) {
-    if (idx == 0) {
-      ss << "\t [ ";
-    }
-    for (auto& col : row.gfx_busy_acc) {
-      ss << "\t [" << idx << "] [" << idy << "]: " << col;
-      if (idy + 1 != (std::end(row.gfx_busy_acc) - std::end(row.gfx_busy_acc) - 1)) {
-        ss << ", ";
-      }
-      if (idx + 1 !=
-          (std::end(m_gpu_metrics_tbl.m_xcp_stats) - std::end(m_gpu_metrics_tbl.m_xcp_stats) - 1)) {
-        ss << "\n";
-      } else {
-        ss << "]\n";
-      }
-      idy++;
-    }
-    idx++;
-  }
+  // GfxLock Info
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricGfxClkLockStatus]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxClkLockStatus,
+              format_metric_row(m_gpu_metrics_tbl.m_gfxclk_lock_status,
+                                "gfxclk_lock_status")));
 
-  LOG_DEBUG(ss);
-}
+  // Timestamp Info
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricTimestamp]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricTSFirmware,
+              format_metric_row(m_gpu_metrics_tbl.m_firmware_timestamp,
+                                "firmware_timestamp")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricTimestamp]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricTSClockCounter,
+              format_metric_row(m_gpu_metrics_tbl.m_system_clock_counter,
+                                "system_clock_counter")));
 
+  // Link/Width/Speed Info
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieLinkWidth,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_link_width,
+                                "pcie_link_width")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieLinkSpeed,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_link_speed,
+                                "pcie_link_speed")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricXgmiLinkWidth,
+              format_metric_row(m_gpu_metrics_tbl.m_xgmi_link_width,
+                                "xgmi_link_width")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricXgmiLinkSpeed,
+              format_metric_row(m_gpu_metrics_tbl.m_xgmi_link_speed,
+                                "xgmi_link_speed")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieBandwidthAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_bandwidth_acc,
+                                "pcie_bandwidth_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieBandwidthInst,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_bandwidth_inst,
+                                "pcie_bandwidth_inst")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieL0RecovCountAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_l0_to_recov_count_acc,
+                                "pcie_l0_recov_count_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieReplayCountAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_replay_count_acc,
+                                "pcie_replay_count_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieReplayRollOverCountAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_replay_rover_count_acc,
+                                "pcie_replay_rollover_count_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieNakSentCountAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_nak_sent_count_acc,
+                                "pcie_nak_sent_count_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieNakReceivedCountAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_pcie_nak_rcvd_count_acc,
+                                "pcie_nak_rcvd_count_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricXgmiReadDataAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_xgmi_read_data_acc,
+                                "[xgmi_read_data_acc]")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricXgmiWriteDataAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_xgmi_write_data_acc,
+                                "[xgmi_write_data_acc]")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+  .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricXgmiLinkStatus,
+            format_metric_row(m_gpu_metrics_tbl.m_xgmi_link_status,
+                              "[xgmi_link_status]")));
 
-void GpuMetricsBase_v16_t::dump_internal_metrics_table()
-{
-  std::ostringstream ss;
-  auto idx = uint64_t(0);
-  auto idy = uint64_t(0);
-  std::cout << __PRETTY_FUNCTION__ << " | ======= start ======= \n";
-  ss << __PRETTY_FUNCTION__
-     << " | ======= DEBUG ======= "
-     << " | Metric Version: "
-     << stringfy_metric_header_version(m_gpu_metrics_tbl.m_common_header)
-     << " | Size: "
-     << print_unsigned_int(m_gpu_metrics_tbl.m_common_header.m_structure_size)
-     << " |"
-     << "\n";
-  ss  << " temperature_hotspot: " << m_gpu_metrics_tbl.m_temperature_hotspot  << "\n"
-      << " temperature_mem: " << m_gpu_metrics_tbl.m_temperature_mem << "\n"
-      << " temperature_vrsoc: " << m_gpu_metrics_tbl.m_temperature_vrsoc << "\n"
-      << " current_socket_power: " << m_gpu_metrics_tbl.m_current_socket_power << "\n"
-      << " average_gfx_activity: " << m_gpu_metrics_tbl.m_average_gfx_activity << "\n"
-      << " average_umc_activity: " << m_gpu_metrics_tbl.m_average_umc_activity << "\n";
-
-  ss  << " energy_accumulator: " << m_gpu_metrics_tbl.m_energy_accumulator << "\n"
-      << " system_clock_counter: " << m_gpu_metrics_tbl.m_system_clock_counter << "\n"
-      << " accumulation_counter: " << m_gpu_metrics_tbl.m_accumulation_counter << "\n"
-      << " prochot_residency_acc: " << m_gpu_metrics_tbl.m_prochot_residency_acc << "\n"
-      << " ppt_residency_acc: " << m_gpu_metrics_tbl.m_ppt_residency_acc << "\n"
-      << " socket_thm_residency_acc: " << m_gpu_metrics_tbl.m_socket_thm_residency_acc << "\n"
-      << " vr_thm_residency_acc: " << m_gpu_metrics_tbl.m_vr_thm_residency_acc << "\n"
-      << " hbm_thm_residency_acc: " << m_gpu_metrics_tbl.m_hbm_thm_residency_acc << "\n"
-      << " average_gfx_activity: " << m_gpu_metrics_tbl.m_average_gfx_activity << "\n"
-      << " average_umc_activity: " << m_gpu_metrics_tbl.m_average_umc_activity << "\n"
-      << " gfxclk_lock_status: " << m_gpu_metrics_tbl.m_gfxclk_lock_status << "\n"
-      << " pcie_link_width: " << m_gpu_metrics_tbl.m_pcie_link_width << "\n"
-      << " pcie_link_speed: " << m_gpu_metrics_tbl.m_pcie_link_speed << "\n"
-      << " xgmi_link_width: " << m_gpu_metrics_tbl.m_xgmi_link_width << "\n"
-      << " xgmi_link_speed: " << m_gpu_metrics_tbl.m_xgmi_link_speed << "\n"
-      << " gfx_activity_acc: " << m_gpu_metrics_tbl.m_gfx_activity_acc << "\n"
-      << " mem_activity_acc: " << m_gpu_metrics_tbl.m_mem_activity_acc << "\n"
-      << " pcie_bandwidth_acc: " << m_gpu_metrics_tbl.m_pcie_bandwidth_acc << "\n"
-      << " pcie_bandwidth_inst: " << m_gpu_metrics_tbl.m_pcie_bandwidth_inst << "\n"
-      << " pcie_l0_to_recov_count_acc: " << m_gpu_metrics_tbl.m_pcie_l0_to_recov_count_acc << "\n"
-      << " pcie_replay_count_acc: " << m_gpu_metrics_tbl.m_pcie_replay_count_acc << "\n"
-      << " pcie_replay_rover_count_acc: " << m_gpu_metrics_tbl.m_pcie_replay_rover_count_acc << "\n"
-      << " pcie_nak_sent_count_acc: " << m_gpu_metrics_tbl.m_pcie_nak_sent_count_acc << "\n"
-      << " pcie_nak_rcvd_count_acc: " << m_gpu_metrics_tbl.m_pcie_nak_rcvd_count_acc << "\n"
-      << " firmware_timestamp: " << m_gpu_metrics_tbl.m_firmware_timestamp << "\n"
-      << " current_uclk: " << m_gpu_metrics_tbl.m_current_uclk << "\n"
-      << " num_partition: " << m_gpu_metrics_tbl.m_num_partition << "\n"
-      << " pcie_lc_perf_other_end_recovery: "
-      << m_gpu_metrics_tbl.m_pcie_lc_perf_other_end_recovery << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_read_data_acc) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+  // CurrentClock Info
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricCurrentClock]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricCurrGfxClock,
+              format_metric_row(m_gpu_metrics_tbl.m_current_gfxclk,
+                                "[current_gfxclk]")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricCurrentClock]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricCurrSocClock,
+              format_metric_row(m_gpu_metrics_tbl.m_current_socclk,
+                                "[current_socclk]")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricCurrentClock]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricCurrVClock0,
+              format_metric_row(m_gpu_metrics_tbl.m_current_vclk0,
+                                "[current_vclk0]")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricCurrentClock]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricCurrDClock0,
+              format_metric_row(m_gpu_metrics_tbl.m_current_dclk0,
+                                "[current_dclk0]")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricCurrentClock]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricCurrUClock,
+              format_metric_row(m_gpu_metrics_tbl.m_current_uclk,
+                                "current_uclk")));
 
-  ss  << " xgmi_write_data_acc: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_write_data_acc) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+  /* Accumulation cycle counter */
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricThrottleResidency]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricAccumulationCounter,
+              format_metric_row(m_gpu_metrics_tbl.m_accumulation_counter,
+                                "accumulation_counter")));
 
-  ss  << " current_gfxclk: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_gfxclk) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+  /* Accumulated throttler residencies */
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricThrottleResidency]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricProchotResidencyAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_prochot_residency_acc,
+                                "prochot_residency_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricThrottleResidency]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPPTResidencyAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_ppt_residency_acc,
+                                "ppt_residency_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricThrottleResidency]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricSocketThmResidencyAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_socket_thm_residency_acc,
+                                "socket_thm_residency_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricThrottleResidency]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricVRThmResidencyAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_vr_thm_residency_acc,
+                                "vr_thm_residency_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricThrottleResidency]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricHBMThmResidencyAccumulator,
+              format_metric_row(m_gpu_metrics_tbl.m_hbm_thm_residency_acc,
+                                "hbm_thm_residency_acc")));
 
-  ss  << " current_socclk: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_socclk) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+  /* Partition info */
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricPartition]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kGpuMetricNumPartition,
+              format_metric_row(m_gpu_metrics_tbl.m_num_partition,
+                                "num_partition")));
 
-  ss  << " current_vclk0: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_vclk0) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+  /* xcp_stats info */
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxBusyInst,
+              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_busy_inst,
+                                "xcp_stats->gfx_busy_inst")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricVcnBusy,
+              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->vcn_busy,
+                                "xcp_stats->vcn_busy")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricJpegBusy,
+              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->jpeg_busy,
+                                "xcp_stats->jpeg_busy")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxBusyAcc,
+              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_busy_acc,
+                                "xcp_stats->gfx_busy_acc")));
 
-  ss  << " current_dclk0: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_dclk0) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
+  /* gpu metrics v1.8 xcp_stats info */
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitTotalAcc,
+              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_below_host_limit_total_acc,
+                                "xcp_stats->gfx_below_host_limit_total_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitPptAcc,
+              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_below_host_limit_ppt_acc,
+                                "xcp_stats->gfx_below_host_limit_ppt_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitThmAcc,
+              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_below_host_limit_thm_acc,
+                                "xcp_stats->gfx_below_host_limit_thm_acc")));
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxLowUtilitizationAcc,
+              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_low_utilization_acc,
+                                "xcp_stats->gfx_low_utilization_acc")));
 
-  idx = 0;
-  idy = 0;
-  ss  << " xcp_stats.gfx_busy_inst: " << "\n";
-  for (auto& row : m_gpu_metrics_tbl.m_xcp_stats) {
-    if (idx == 0) {
-      ss << "\t [ ";
-    }
-    for (auto& col : row.gfx_busy_inst) {
-      ss << "\t [" << idx << "] [" << idy << "]: " << col;
-      if (idy + 1 != (std::end(row.gfx_busy_inst) - std::end(row.gfx_busy_inst) - 1)) {
-        ss << ", ";
-      }
-      if (idx + 1 !=
-          (std::end(m_gpu_metrics_tbl.m_xcp_stats) - std::end(m_gpu_metrics_tbl.m_xcp_stats) - 1)) {
-        ss << "\n";
-      } else {
-        ss << "]\n";
-      }
-      idy++;
-    }
-    idx++;
-  }
+  /* PCIE other end recovery counter info */
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieLCPerfOtherEndRecov,
+           format_metric_row(m_gpu_metrics_tbl.m_pcie_lc_perf_other_end_recovery,
+                                "pcie_lc_perf_other_end_recovery")));
 
-  idx = 0;
-  idy = 0;
-  ss  << " xcp_stats.vcn_busy: " << "\n";
-  for (auto& row : m_gpu_metrics_tbl.m_xcp_stats) {
-    if (idx == 0) {
-      ss << "\t [ ";
-    }
-    for (auto& col : row.vcn_busy) {
-      ss << "\t [" << idx << "] [" << idy << "]: " << col;
-      if (idy + 1 != (std::end(row.vcn_busy) - std::end(row.vcn_busy) - 1)) {
-        ss << ", ";
-      }
-      if (idx + 1 !=
-          (std::end(m_gpu_metrics_tbl.m_xcp_stats) - std::end(m_gpu_metrics_tbl.m_xcp_stats) - 1)) {
-        ss << "\n";
-      } else {
-        ss << "]\n";
-      }
-      idy++;
-    }
-    idx++;
-  }
+  /* VRAM max bandwidth (in GB/sec) at max memory clock */
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
+    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricVramMaxBandwidth,
+              format_metric_row(m_gpu_metrics_tbl.m_mem_max_bandwidth,
+                                "vram_max_bandwidth")));
 
-  idx = 0;
-  idy = 0;
-  ss  << " xcp_stats.jpeg_busy: " << "\n";
-  for (auto& row : m_gpu_metrics_tbl.m_xcp_stats) {
-    if (idx == 0) {
-      ss << "\t [ ";
-    }
-    for (auto& col : row.jpeg_busy) {
-      ss << "\t [" << idx << "] [" << idy << "]: " << col;
-      if (idy + 1 != (std::end(row.jpeg_busy) - std::end(row.jpeg_busy) - 1)) {
-        ss << ", ";
-      }
-      if (idx + 1 !=
-          (std::end(m_gpu_metrics_tbl.m_xcp_stats) - std::end(m_gpu_metrics_tbl.m_xcp_stats) - 1)) {
-        ss << "\n";
-      } else {
-        ss << "]\n";
-      }
-      idy++;
-    }
-    idx++;
-  }
+  ss << __PRETTY_FUNCTION__ << " | ======= end ======= "
+     << " | Success "
+     << " | Returning = " << getRSMIStatusString(status_code) << " |";
+  LOG_TRACE(ss);
 
-  idx = 0;
-  idy = 0;
-  ss  << " xcp_stats.gfx_busy_acc: " << "\n";
-  for (auto& row : m_gpu_metrics_tbl.m_xcp_stats) {
-    if (idx == 0) {
-      ss << "\t [ ";
-    }
-    for (auto& col : row.gfx_busy_acc) {
-      ss << "\t [" << idx << "] [" << idy << "]: " << col;
-      if (idy + 1 != (std::end(row.gfx_busy_acc) - std::end(row.gfx_busy_acc) - 1)) {
-        ss << ", ";
-      }
-      if (idx + 1 !=
-          (std::end(m_gpu_metrics_tbl.m_xcp_stats) - std::end(m_gpu_metrics_tbl.m_xcp_stats) - 1)) {
-        ss << "\n";
-      } else {
-        ss << "]\n";
-      }
-      idy++;
-    }
-    idx++;
-  }
+  // Copy to base class
+  std::copy(m_metrics_dynamic_tbl.begin(), m_metrics_dynamic_tbl.end(),
+            std::inserter(GpuMetricsBase_t::m_base_metrics_dynamic_tbl,
+                          GpuMetricsBase_t::m_base_metrics_dynamic_tbl.end()));
 
-  LOG_DEBUG(ss);
+  return status_code;
 }
 
 rsmi_status_t GpuMetricsBase_v17_t::populate_metrics_dynamic_tbl() {
@@ -883,10 +758,7 @@ rsmi_status_t GpuMetricsBase_v17_t::populate_metrics_dynamic_tbl() {
   ss << __PRETTY_FUNCTION__ << " | ======= start =======";
   LOG_TRACE(ss);
 
-  if (!m_metrics_dynamic_tbl.empty()) {
-    m_metrics_dynamic_tbl.clear();
-  }
-
+  auto m_metrics_dynamic_tbl = AMDGpuDynamicMetricsTbl_t{};
   //
   //  Note: Any metric treatment/changes (if any) should happen before they
   //        get written to internal/external tables.
@@ -1106,6 +978,11 @@ rsmi_status_t GpuMetricsBase_v17_t::populate_metrics_dynamic_tbl() {
               format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_busy_acc,
                                 "xcp_stats->gfx_busy_acc")));
 
+  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricXcpStats].insert(
+      std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitAccumulator,
+                     format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_below_host_limit_acc,
+                                       "xcp_stats->gfx_below_host_limit_acc")));
+
   /* PCIE other end recovery counter info */
   m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricLinkWidthSpeed]
     .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricPcieLCPerfOtherEndRecov,
@@ -1118,12 +995,6 @@ rsmi_status_t GpuMetricsBase_v17_t::populate_metrics_dynamic_tbl() {
               format_metric_row(m_gpu_metrics_tbl.m_vram_max_bandwidth,
                                 "vram_max_bandwidth")));
 
-  /* Total App Clock Counter Accumulated */
-  m_metrics_dynamic_tbl[AMDGpuMetricsClassId_t::kGpuMetricThrottleResidency]
-    .insert(std::make_pair(AMDGpuMetricsUnitType_t::kMetricGfxBelowHostLimitAccumulator,
-              format_metric_row(m_gpu_metrics_tbl.m_xcp_stats->gfx_below_host_limit_acc,
-                                "gfx_below_host_limit_acc")));
-
   ss << __PRETTY_FUNCTION__
               << " | ======= end ======= "
               << " | Success "
@@ -1131,6 +1002,12 @@ rsmi_status_t GpuMetricsBase_v17_t::populate_metrics_dynamic_tbl() {
               << " |";
   LOG_TRACE(ss);
 
+  // Copy to base class
+  std::copy(m_metrics_dynamic_tbl.begin(),
+            m_metrics_dynamic_tbl.end(),
+            std::inserter(GpuMetricsBase_t::m_base_metrics_dynamic_tbl,
+                          GpuMetricsBase_t::m_base_metrics_dynamic_tbl.end()));
+
   return status_code;
 }
 
@@ -1140,10 +1017,7 @@ rsmi_status_t GpuMetricsBase_v16_t::populate_metrics_dynamic_tbl() {
   ss << __PRETTY_FUNCTION__ << " | ======= start =======";
   LOG_TRACE(ss);
 
-  if (!m_metrics_dynamic_tbl.empty()) {
-    m_metrics_dynamic_tbl.clear();
-  }
-
+  auto m_metrics_dynamic_tbl = AMDGpuDynamicMetricsTbl_t{};
   //
   //  Note: Any metric treatment/changes (if any) should happen before they
   //        get written to internal/external tables.
@@ -1371,127 +1245,22 @@ rsmi_status_t GpuMetricsBase_v16_t::populate_metrics_dynamic_tbl() {
               << " |";
   LOG_TRACE(ss);
 
-  return status_code;
-}
-
-void GpuMetricsBase_v15_t::dump_internal_metrics_table()
-{
-  std::ostringstream ss;
-  std::cout << __PRETTY_FUNCTION__ << " | ======= start ======= \n";
-  ss << __PRETTY_FUNCTION__
-              << " | ======= DEBUG ======= "
-              << " | Metric Version: " << stringfy_metric_header_version(m_gpu_metrics_tbl.m_common_header)
-              << " | Size: " << print_unsigned_int(m_gpu_metrics_tbl.m_common_header.m_structure_size)
-              << " |"
-              << "\n";
-  ss  << " temperature_hotspot: " << m_gpu_metrics_tbl.m_temperature_hotspot  << "\n"
-              << " temperature_mem: " << m_gpu_metrics_tbl.m_temperature_mem << "\n"
-              << " temperature_vrsoc: " << m_gpu_metrics_tbl.m_temperature_vrsoc << "\n"
-
-              << " current_socket_power: " << m_gpu_metrics_tbl.m_current_socket_power << "\n"
-
-              << " average_gfx_activity: " << m_gpu_metrics_tbl.m_average_gfx_activity << "\n"
-              << " average_umc_activity: " << m_gpu_metrics_tbl.m_average_umc_activity << "\n";
-
-  ss  << " vcn_activity: " << "\n";
-  auto idx = uint64_t(0);
-  for (const auto& temp : m_gpu_metrics_tbl.m_vcn_activity) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " jpeg_activity: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_jpeg_activity) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " energy_accumulator: " << m_gpu_metrics_tbl.m_energy_accumulator << "\n"
-              << " system_clock_counter: " << m_gpu_metrics_tbl.m_system_clock_counter << "\n"
-
-              << " throttle_status: " << m_gpu_metrics_tbl.m_throttle_status << "\n"
-
-              << " average_gfx_activity: " << m_gpu_metrics_tbl.m_average_gfx_activity << "\n"
-              << " average_umc_activity: " << m_gpu_metrics_tbl.m_average_umc_activity << "\n"
-
-              << " gfxclk_lock_status: " << m_gpu_metrics_tbl.m_gfxclk_lock_status << "\n"
-
-              << " pcie_link_width: " << m_gpu_metrics_tbl.m_pcie_link_width << "\n"
-              << " pcie_link_speed: " << m_gpu_metrics_tbl.m_pcie_link_speed << "\n"
-
-              << " xgmi_link_width: " << m_gpu_metrics_tbl.m_xgmi_link_width << "\n"
-              << " xgmi_link_speed: " << m_gpu_metrics_tbl.m_xgmi_link_speed << "\n"
+  // Copy to base class
+  std::copy(m_metrics_dynamic_tbl.begin(),
+            m_metrics_dynamic_tbl.end(),
+            std::inserter(GpuMetricsBase_t::m_base_metrics_dynamic_tbl,
+                          GpuMetricsBase_t::m_base_metrics_dynamic_tbl.end()));
 
-              << " gfx_activity_acc: " << m_gpu_metrics_tbl.m_gfx_activity_acc << "\n"
-              << " mem_activity_acc: " << m_gpu_metrics_tbl.m_mem_activity_acc << "\n"
-
-              << " pcie_bandwidth_acc: " << m_gpu_metrics_tbl.m_pcie_bandwidth_acc << "\n"
-              << " pcie_bandwidth_inst: " << m_gpu_metrics_tbl.m_pcie_bandwidth_inst << "\n"
-              << " pcie_l0_to_recov_count_acc: " << m_gpu_metrics_tbl.m_pcie_l0_to_recov_count_acc << "\n"
-              << " pcie_replay_count_acc: " << m_gpu_metrics_tbl.m_pcie_replay_count_acc << "\n"
-              << " pcie_replay_rover_count_acc: " << m_gpu_metrics_tbl.m_pcie_replay_rover_count_acc << "\n"
-              << " pcie_nak_sent_count_acc: " << m_gpu_metrics_tbl.m_pcie_nak_sent_count_acc << "\n"
-              << " pcie_nak_rcvd_count_acc: " << m_gpu_metrics_tbl.m_pcie_nak_rcvd_count_acc << "\n";
-
-  ss  << " xgmi_read_data_acc: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_read_data_acc) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " xgmi_write_data_acc: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_write_data_acc) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " firmware_timestamp: " << m_gpu_metrics_tbl.m_firmware_timestamp << "\n";
-
-  ss  << " current_gfxclk: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_gfxclk) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " current_socclk: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_socclk) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " current_vclk0: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_vclk0) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " current_dclk0: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_dclk0) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " padding: " << m_gpu_metrics_tbl.m_padding << "\n";
-  LOG_DEBUG(ss);
+  return status_code;
 }
 
 rsmi_status_t GpuMetricsBase_v15_t::populate_metrics_dynamic_tbl() {
   std::ostringstream ss;
   auto status_code(rsmi_status_t::RSMI_STATUS_SUCCESS);
   ss << __PRETTY_FUNCTION__ << " | ======= start =======";
-  LOG_TRACE(ss);
-
-  if (!m_metrics_dynamic_tbl.empty()) {
-    m_metrics_dynamic_tbl.clear();
-  }
+  LOG_TRACE(ss);
 
+  auto m_metrics_dynamic_tbl = AMDGpuDynamicMetricsTbl_t{};
   //
   //  Note: Any metric treatment/changes (if any) should happen before they
   //        get written to internal/external tables.
@@ -1708,107 +1477,13 @@ rsmi_status_t GpuMetricsBase_v15_t::populate_metrics_dynamic_tbl() {
               << " |";
   LOG_TRACE(ss);
 
-  return status_code;
-}
-
-
-void GpuMetricsBase_v14_t::dump_internal_metrics_table()
-{
-  std::ostringstream ss;
-  std::cout << __PRETTY_FUNCTION__ << " | ======= start ======= \n";
-  ss << __PRETTY_FUNCTION__
-              << " | ======= DEBUG ======= "
-              << " | Metric Version: " << stringfy_metric_header_version(m_gpu_metrics_tbl.m_common_header)
-              << " | Size: " << print_unsigned_int(m_gpu_metrics_tbl.m_common_header.m_structure_size)
-              << " |"
-              << "\n";
-  ss  << " temperature_hotspot: " << m_gpu_metrics_tbl.m_temperature_hotspot  << "\n"
-              << " temperature_mem: " << m_gpu_metrics_tbl.m_temperature_mem << "\n"
-              << " temperature_vrsoc: " << m_gpu_metrics_tbl.m_temperature_vrsoc << "\n"
-
-              << " current_socket_power: " << m_gpu_metrics_tbl.m_current_socket_power << "\n"
-
-              << " average_gfx_activity: " << m_gpu_metrics_tbl.m_average_gfx_activity << "\n"
-              << " average_umc_activity: " << m_gpu_metrics_tbl.m_average_umc_activity << "\n";
-
-  ss  << " vcn_activity: " << "\n";
-  auto idx = uint64_t(0);
-  for (const auto& temp : m_gpu_metrics_tbl.m_vcn_activity) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " energy_accumulator: " << m_gpu_metrics_tbl.m_energy_accumulator << "\n"
-              << " system_clock_counter: " << m_gpu_metrics_tbl.m_system_clock_counter << "\n"
-
-              << " throttle_status: " << m_gpu_metrics_tbl.m_throttle_status << "\n"
-
-              << " average_gfx_activity: " << m_gpu_metrics_tbl.m_average_gfx_activity << "\n"
-              << " average_umc_activity: " << m_gpu_metrics_tbl.m_average_umc_activity << "\n"
-
-              << " gfxclk_lock_status: " << m_gpu_metrics_tbl.m_gfxclk_lock_status << "\n"
-
-              << " pcie_link_width: " << m_gpu_metrics_tbl.m_pcie_link_width << "\n"
-              << " pcie_link_speed: " << m_gpu_metrics_tbl.m_pcie_link_speed << "\n"
-
-              << " xgmi_link_width: " << m_gpu_metrics_tbl.m_xgmi_link_width << "\n"
-              << " xgmi_link_speed: " << m_gpu_metrics_tbl.m_xgmi_link_speed << "\n"
-
-              << " gfx_activity_acc: " << m_gpu_metrics_tbl.m_gfx_activity_acc << "\n"
-              << " mem_activity_acc: " << m_gpu_metrics_tbl.m_mem_activity_acc << "\n"
+  // Copy to base class
+  std::copy(m_metrics_dynamic_tbl.begin(),
+            m_metrics_dynamic_tbl.end(),
+            std::inserter(GpuMetricsBase_t::m_base_metrics_dynamic_tbl,
+                          GpuMetricsBase_t::m_base_metrics_dynamic_tbl.end()));
 
-              << " pcie_bandwidth_acc: " << m_gpu_metrics_tbl.m_pcie_bandwidth_acc << "\n"
-              << " pcie_bandwidth_inst: " << m_gpu_metrics_tbl.m_pcie_bandwidth_inst << "\n"
-              << " pcie_l0_to_recov_count_acc: " << m_gpu_metrics_tbl.m_pcie_l0_to_recov_count_acc << "\n"
-              << " pcie_replay_count_acc: " << m_gpu_metrics_tbl.m_pcie_replay_count_acc << "\n"
-              << " pcie_replay_rover_count_acc: " << m_gpu_metrics_tbl.m_pcie_replay_rover_count_acc << "\n";
-
-  ss  << " xgmi_read_data_acc: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_read_data_acc) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " xgmi_write_data_acc: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_xgmi_write_data_acc) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " firmware_timestamp: " << m_gpu_metrics_tbl.m_firmware_timestamp << "\n";
-
-  ss  << " current_gfxclk: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_gfxclk) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " current_socclk: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_socclk) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " current_vclk0: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_vclk0) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " current_dclk0: " << "\n";
-  idx = 0;
-  for (const auto& temp : m_gpu_metrics_tbl.m_current_dclk0) {
-    ss << "\t [" << idx << "]: " << temp << "\n";
-    ++idx;
-  }
-
-  ss  << " padding: " << m_gpu_metrics_tbl.m_padding << "\n";
-  LOG_DEBUG(ss);
+  return status_code;
 }
 
 rsmi_status_t GpuMetricsBase_v14_t::populate_metrics_dynamic_tbl() {
@@ -1817,10 +1492,7 @@ rsmi_status_t GpuMetricsBase_v14_t::populate_metrics_dynamic_tbl() {
   ss << __PRETTY_FUNCTION__ << " | ======= start =======";
   LOG_TRACE(ss);
 
-  if (!m_metrics_dynamic_tbl.empty()) {
-    m_metrics_dynamic_tbl.clear();
-  }
-
+  auto m_metrics_dynamic_tbl = AMDGpuDynamicMetricsTbl_t{};
   //
   //  Note: Any metric treatment/changes (if any) should happen before they
   //        get written to internal/external tables.
@@ -2022,6 +1694,12 @@ rsmi_status_t GpuMetricsBase_v14_t::populate_metrics_dynamic_tbl() {
      << " |";
   LOG_TRACE(ss);
 
+  // Copy to base class
+  std::copy(m_metrics_dynamic_tbl.begin(),
+            m_metrics_dynamic_tbl.end(),
+            std::inserter(GpuMetricsBase_t::m_base_metrics_dynamic_tbl,
+                          GpuMetricsBase_t::m_base_metrics_dynamic_tbl.end()));
+
   return status_code;
 }
 
@@ -2125,6 +1803,7 @@ rsmi_status_t init_max_public_gpu_matrics(AMGpuMetricsPublicLatest_t& rsmi_gpu_m
 
   rsmi_gpu_metrics.pcie_nak_sent_count_acc = init_max_uint_types<decltype(rsmi_gpu_metrics.pcie_nak_sent_count_acc)>();
   rsmi_gpu_metrics.pcie_nak_rcvd_count_acc = init_max_uint_types<decltype(rsmi_gpu_metrics.pcie_nak_rcvd_count_acc)>();
+
   rsmi_gpu_metrics.accumulation_counter = init_max_uint_types<decltype(rsmi_gpu_metrics.accumulation_counter)>();
   rsmi_gpu_metrics.prochot_residency_acc = init_max_uint_types<decltype(rsmi_gpu_metrics.prochot_residency_acc)>();
   rsmi_gpu_metrics.ppt_residency_acc = init_max_uint_types<decltype(rsmi_gpu_metrics.ppt_residency_acc)>();
@@ -2148,6 +1827,14 @@ rsmi_status_t init_max_public_gpu_matrics(AMGpuMetricsPublicLatest_t& rsmi_gpu_m
               init_max_uint_types<std::uint64_t>());
     std::fill(std::begin(row.gfx_below_host_limit_acc), std::end(row.gfx_below_host_limit_acc),
               init_max_uint_types<std::uint64_t>());
+    std::fill(std::begin(row.gfx_below_host_limit_ppt_acc), std::end(row.gfx_below_host_limit_ppt_acc),
+              init_max_uint_types<std::uint64_t>());
+    std::fill(std::begin(row.gfx_below_host_limit_thm_acc), std::end(row.gfx_below_host_limit_thm_acc),
+              init_max_uint_types<std::uint64_t>());
+    std::fill(std::begin(row.gfx_low_utilization_acc), std::end(row.gfx_low_utilization_acc),
+              init_max_uint_types<std::uint64_t>());
+    std::fill(std::begin(row.gfx_below_host_limit_total_acc), std::end(row.gfx_below_host_limit_total_acc),
+              init_max_uint_types<std::uint64_t>());
   }
 
   ss << __PRETTY_FUNCTION__
@@ -2160,6 +1847,213 @@ rsmi_status_t init_max_public_gpu_matrics(AMGpuMetricsPublicLatest_t& rsmi_gpu_m
   return status_code;
 }
 
+AMGpuMetricsPublicLatestTupl_t GpuMetricsBase_v18_t::copy_internal_to_external_metrics()
+{
+  std::ostringstream ss;