Merge ~tchavadar/ubuntu/+source/pkg-rocm-tools:ubuntu/devel into ubuntu/+source/pkg-rocm-tools:ubuntu/devel

[Talha Can Havadar]

Adding gfx11-generic to build targets enables ROCm stack to build for other platforms.

I have AMD Ryzen AI 7 350 cpu which has gfx1152 together with it. This would allow those PCs to utilize ROCm as well.

That said, option introduced to llvm with this commit: https://github.com/llvm/llvm-project/commit/f93aa5157a3317b24cff660ac972814ee9ed4dbc

I am still thinking if we should use gfx1152 and gfx1153 directly instead of gfx11-generic but not exactly sure about the performance benefits of optimized builds but the generic would at least enable the platform so thats why I created this merge proposal.

[Frank Heimes (fheimes)]

So this is supposed to be a new version that should bump the existing version in resolute,
means replacing the currently existing 0.9.4ubuntu1. With that the new version (0.9.5ubuntu1) is fine.

I think that the modifications are reasonable and pretty straight forward - nevertheless I always recommend to do a test build in PPA (not sure if ouy've done that, if so just reference it here and/or in the associated LP bug, since it always increases confidence).
However, I cannot elaborate on your thought "if we should use gfx1152 and gfx1153 directly instead of gfx11-generic", but using gfx11-generic does not seem to be a bad thing.

Only issue I see is the changelog, that requires a reference to the LP bug number.
And if there is no LP bug yet, once is needed just for this (but since it's an update in Ubuntu devel, the entire SRU template is not needed.)

So needs minor fixing ...

review: Needs Fixing

[Talha Can Havadar (tchavadar)]

Thank you very much for the review Frank I will address the issue you mentioned gonna create a bug and update the changelog accordingly

[Talha Can Havadar (tchavadar)]

Just created the bug, updated the changelog and upload the package to my proposed enabled ppa (https://launchpad.net/~tchavadar/+archive/ubuntu/lp2138457)

Can you please have another look?

[Frank Heimes (fheimes)]

Okay, that's great Talha.
And you also linked the LP bug here to the MR at 'Link a bug report', so that the MR shows up in the bug.
So LGTM, approve!

review: Approve

[Talha Can Havadar (tchavadar)]

Thanks again Frank!

diff --git a/bin/rocm-target-arch b/bin/rocm-target-arch
index d0bc28e..fca3914 100755
--- a/bin/rocm-target-arch
+++ b/bin/rocm-target-arch
@@ -7,16 +7,6 @@
 # License: MIT
 set -eu
 
-if ! [ -f "debian/changelog" ]; then
-    echo "debian/changelog not found." >&2
-    exit 1
-fi
-
-DATADIR=/usr/share/pkg-rocm-tools/data/build-targets
-DIST="$(dpkg-parsechangelog -Sdistribution)"
-SEP=" "
-REDUCE=0
-
 usage() {
     cat >&2 <<-EOF | fmt -w "${COLUMNS:-80}"
 
@@ -56,6 +46,28 @@ EOF
 }
 
 #
+# check to see if usage should be shown early since the main arg parsing loop
+# requires d/changelog and there are valid cases where one would run --help
+# when that file doesn't exist
+#
+if [ $# -gt 0 ]; then
+    if [ $1 = '-h' ] || [ $1 = '--help' ]; then
+        usage
+        exit 0
+    fi
+fi
+
+if ! [ -f "debian/changelog" ]; then
+    echo "debian/changelog not found." >&2
+    exit 1
+fi
+
+DATADIR=/usr/share/pkg-rocm-tools/data/build-targets
+DIST="$(dpkg-parsechangelog -Sdistribution)"
+SEP=" "
+REDUCE=0
+
+#
 # Get package names from a list of relationships
 #
 # Given the value of a Depends or Build-Depends field, return a list of all
@@ -213,6 +225,8 @@ intersect_gfxarches() {
 
 #
 # Parse options
+# -h/--help is parsed elsewhere due to this block requiring d/changelog to
+# exist and usage is helpful to run even if d/changelog doesn't exist
 #
 while [ $# -gt 0 ]; do
 case "$1" in
@@ -246,10 +260,6 @@ case "$1" in
         REDUCE=1
         shift 1
         ;;
-    -h|--help)
-        usage
-        exit 0
-        ;;
     *)
         echo "Error: unknown option $1" >&2
         usage
diff --git a/data/build-targets/resolute b/data/build-targets/resolute
index 59dff30..f436f3b 100644
--- a/data/build-targets/resolute
+++ b/data/build-targets/resolute
@@ -3,5 +3,6 @@ gfx942
 gfx1030
 gfx1100
 gfx1151
+gfx11-generic
 gfx1200
 gfx1201
diff --git a/debian/changelog b/debian/changelog
index ab4d60e..a9de760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+pkg-rocm-tools (0.9.5ubuntu1) resolute; urgency=medium
+
+  * add gfx11-generic for build targets. (LP: #2138457)
+    - Compile generic code for GFX11 devices, executable on gfx1100, gfx1101,
+    gfx1102, gfx1103, gfx1150, gfx1151, gfx1152, and gfx1153.
+
+ -- Talha Can Havadar <[e-mail]>  Fri, 02 Jan 2026 00:47:54 +0100
+
+pkg-rocm-tools (0.9.5) unstable; urgency=medium
+
+  [ Tim Flink ]
+  * allow -h/--help to work without d/changelog
+
+ -- Christian Kastner <[e-mail]>  Wed, 10 Dec 2025 23:17:28 +0100
+
 pkg-rocm-tools (0.9.4ubuntu1) resolute; urgency=medium
 
   * created targets file for Ubuntu resolute