Merge branch 'develop' into user/ihhethan/SWDEV-561821

Author: ihhethan

.github/CODEOWNERS

@@ -44,6 +44,8 @@
 # rocr-runtime section-specific code owners
 /projects/rocr-runtime/libhsakmt                                      @kentrussell @dayatsin-amd @cfreeamd
 /projects/rocr-runtime/libhsakmt/tests/kfdtest                        @kentrussell @xiaogang-chen-amd
+/projects/rocr-runtime/libhsakmt/include/impl                         @dayatsin-amd @cfreeamd @gandryey @chrispaquot
+/projects/rocr-runtime/libhsakmt/src/dxg                              @dayatsin-amd @cfreeamd @gandryey @chrispaquot
 /projects/rocr-runtime/rocrtst                                        @shwetagkhatri @cfreeamd
 /projects/rocr-runtime/runtime/hsa-runtime/core/runtime/trap_handler/*.s	@lancesix @dayatsin-amd @cfreeamd @shwetagkhatri
 /projects/rocr-runtime/runtime/hsa-runtime/core/driver/xdna           @atgutier @ypapadop-amd @dayatsin-amd @cfreeamd
@@ -52,6 +54,9 @@
 /projects/rocr-runtime/runtime/hsa-runtime/image                      @shwetagkhatri @dayatsin-amd @cfreeamd
 /projects/rocr-runtime/runtime/hsa-runtime/pcs                        @shwetagkhatri @dayatsin-amd @cfreeamd
 
+# rocprof-trace-decoder code owners
+/projects/rocprof-trace-decoder/                                      @ROCm/rocm-devtools-team
+
 # Documentation-specific ownership by project
 
 /projects/clr/**/*.md                                                 @ROCm/clr-reviewers @ROCm/lrt-docs-reviewers
@@ -97,3 +102,4 @@
 /projects/rocr-runtime/**/*.rst                                       @kentrussell @dayatsin-amd @ROCm/rocm-documentation
 /projects/rocr-runtime/**/.readthedocs.yaml                           @kentrussell @dayatsin-amd @ROCm/rocm-documentation
 
+/projects/rocprof-trace-decoder/**/*.md                               @ROCm/rocm-devtools-team @ROCm/rocm-documentation

.github/labeler.yml

@@ -66,6 +66,10 @@
 - changed-files:
   - any-glob-to-any-file: 'projects/rocprofiler-systems/**/*'
 
+"project: rocprof-trace-decoder":
+- changed-files:
+  - any-glob-to-any-file: 'projects/rocprof-trace-decoder/**/*'
+
 "project: rocr-runtime":
 - changed-files:
   - any-glob-to-any-file: 'projects/rocr-runtime/**/*'

.github/scripts/pr_merge_sync_patches.py

@@ -32,6 +32,7 @@
 import shutil
 import subprocess
 import tempfile
+from email.header import decode_header
 from typing import Optional, List
 from pathlib import Path
 from github_cli_client import GitHubCLIClient
@@ -103,6 +104,34 @@ def get_subtree_info(config: List[RepoEntry], subtrees: List[str]) -> List[RepoE
     return matched
 
 
+def _get_patch_range(merge_sha: str) -> tuple[str, str]:
+    """Derive the commit range for patch-back from the merge commit.
+
+    - Squash merge (1 parent): range = parent..merge (single squashed commit).
+    - Rebase and merge (1 parent): range = parent..merge; only the tip commit is
+      included (earlier rebased commits are not patched back; limitation).
+    - Merge commit (2 parents): range = first_parent..second_parent (PR branch only).
+
+    Returns: (base_sha, range_end) so the range is base_sha..range_end.
+    """
+    out = _run_git(["rev-list", "--parents", "-n", "1", merge_sha])
+    parts = out.split()
+    if len(parts) < 2:
+        raise RuntimeError(f"Could not read parents of merge commit {merge_sha}")
+    merge_full = parts[0]
+    parents = parts[1:]
+    if len(parents) == 2:
+        # Merge commit: first parent = base at merge time, second = PR branch tip
+        return parents[0], parents[1]
+    if len(parents) == 1:
+        # One parent: squash (1 commit) or rebase-and-merge (N commits). The range is
+        # parent..merge (exclusive of parent), which is exactly the PR's commits.
+        return parents[0], merge_full
+    raise RuntimeError(
+        f"Merge commit {merge_sha} has {len(parents)} parents; expected 1 or 2."
+    )
+
+
 def _run_git(args: List[str], cwd: Optional[Path] = None) -> str:
     """Run a git command and return stdout."""
     cmd = ["git"] + args
@@ -167,16 +196,32 @@ def _stage_changes(repo_path: Path) -> None:
     logger.debug(f"Staged all changes in {repo_path}")
 
 
+def _decode_rfc2047_header(value: str) -> str:
+    """Decode RFC 2047 encoded-word (e.g. =?UTF-8?q?foo=20bar?=) to plain text."""
+    if "=?" not in value:
+        return value
+    parts = decode_header(value)
+    result = []
+    for part, charset in parts:
+        if isinstance(part, bytes):
+            result.append(part.decode(charset or "utf-8", errors="replace"))
+        else:
+            result.append(part or "")
+    return "".join(result)
+
+
 def _extract_commit_message_from_patch(patch_path: Path) -> str:
     """Extract and clean the original commit message from the patch file,
-    removing '[PATCH]' and trailing PR references like (#NN) from the title."""
+    removing '[PATCH]' and trailing PR references like (#NN) from the title.
+    Decodes RFC 2047 (MIME) encoded subjects so subrepo commits show plain text."""
     with open(patch_path, "r", encoding="utf-8") as f:
         lines = f.readlines()
     commit_msg_lines = []
     in_msg = False
     for line in lines:
         if line.startswith("Subject: "):
             subject = line[len("Subject: ") :].strip()
+            subject = _decode_rfc2047_header(subject)
             # Remove leading "[PATCH]" if present
             if subject.startswith("[PATCH]"):
                 subject = subject[len("[PATCH]") :].strip()
@@ -261,34 +306,34 @@ def _patch_touched_paths(patch_path: Path) -> List[str]:
 
 def generate_patch(
     prefix: str,
-    merge_sha: str,
     patch_path: Path,
     base_sha: str,
+    range_end: str,
     debug: bool = False,
 ) -> Optional[List[Path]]:
-    """Generate patch file(s) for a given subtree prefix from a merge commit.
+    """Generate patch file(s) for a given subtree prefix from a commit range.
 
     Only commits that actually touch files under the prefix are included, so every
     generated patch has at least one diff hunk and can be applied to the subrepo.
 
     Args:
         prefix: The subtree prefix (e.g., "projects/rocBLAS/")
-        merge_sha: The merge commit SHA
         patch_path: Path where patch file(s) should be written
-        base_sha: Base commit SHA. Required to properly handle both squash and rebase merges.
+        base_sha: Start of range (exclusive)
+        range_end: End of range (inclusive). For squash: merge SHA; for merge commit: merge^2 (second parent).
         debug: If True, log which commits touch the prefix and each patch's paths.
 
     Returns:
         List[Path]: List of patch file paths (one per commit that touches the subtree)
         None: If there are no commits that touch the prefix
     """
     path_arg = prefix.rstrip("/")
-    total_commits = int(_run_git(["rev-list", "--count", f"{base_sha}..{merge_sha}"]))
-    commits = _commits_touching_prefix(base_sha, merge_sha, prefix)
+    total_commits = int(_run_git(["rev-list", "--count", f"{base_sha}..{range_end}"]))
+    commits = _commits_touching_prefix(base_sha, range_end, prefix)
 
     if debug:
         logger.debug(
-            f"Commit range {base_sha}..{merge_sha}: {total_commits} total commit(s), "
+            f"Commit range {base_sha}..{range_end}: {total_commits} total commit(s), "
             f"{len(commits)} commit(s) touch subtree '{path_arg}'"
         )
         for i, sha in enumerate(commits, 1):
@@ -297,7 +342,7 @@ def generate_patch(
 
     if not commits:
         logger.debug(
-            f"No commits in {base_sha}..{merge_sha} touch prefix '{prefix}', skipping"
+            f"No commits in {base_sha}..{range_end} touch prefix '{prefix}', skipping"
         )
         return None
 
@@ -320,7 +365,7 @@ def generate_patch(
     patch_files = sorted(patch_dir.glob("*.patch"))
     if not patch_files:
         raise RuntimeError(
-            f"No patch files generated for range {base_sha}..{merge_sha} with prefix '{prefix}' "
+            f"No patch files generated for range {base_sha}..{range_end} with prefix '{prefix}' "
             f"(expected patches for {len(commits)} commit(s) touching subtree)."
         )
 
@@ -462,15 +507,10 @@ def main(argv: Optional[List[str]] = None) -> None:
         return
     logger.debug(f"Merge commit for PR #{args.pr} in {args.repo}: {merge_sha}")
 
-    # Get base commit to detect if this is a rebase merge with multiple commits
-    base_sha = client.get_pr_base_commit(args.repo, args.pr)
-    if not base_sha:
-        logger.error(
-            f"Could not get base commit for PR #{args.pr} in {args.repo}. "
-            f"Base commit is required to properly handle both squash and rebase merges."
-        )
-        return
-    logger.debug(f"Base commit for PR #{args.pr} in {args.repo}: {base_sha}")
+    # Use merge commit's parents so the range is exactly "commits from this PR", not API base..merge
+    # (squash: merge^1..merge; merge commit: merge^1..merge^2)
+    base_sha, range_end = _get_patch_range(merge_sha)
+    logger.debug(f"Patch range for PR #{args.pr}: {base_sha}..{range_end}")
 
     if args.keep_clone_dir:
         args.no_push = True
@@ -496,7 +536,7 @@ def main(argv: Optional[List[str]] = None) -> None:
 
         try:
             patch_result = generate_patch(
-                prefix, merge_sha, patch_dir_anchor, base_sha, debug=args.debug
+                prefix, patch_dir_anchor, base_sha, range_end, debug=args.debug
             )
             if patch_result is None:
                 logger.debug(f"No patches to apply for subtree {prefix}, skipping")

.github/scripts/tests/conftest.py

@@ -0,0 +1,7 @@
+"""Pytest configuration: ensure pr_merge_sync_patches and siblings are importable."""
+import sys
+from pathlib import Path
+
+scripts_dir = Path(__file__).resolve().parent.parent
+if str(scripts_dir) not in sys.path:
+    sys.path.insert(0, str(scripts_dir))

.github/scripts/tests/test_pr_merge_sync_patches.py

@@ -0,0 +1,149 @@
+"""
+Unit tests for pr_merge_sync_patches: patch range derivation and patch generation.
+
+- PR 3277: rebase-and-merge example (1 parent → range = parent..merge).
+- PR 2514: squash-merge example (1 parent → range = parent..merge).
+"""
+
+import shutil
+import subprocess
+import tempfile
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+# Merge SHAs from GitHub API (ROCm/rocm-systems)
+PR_3277_MERGE_SHA = "c6d7e08fd4b06070e37b3e9aca500224fcc8404c"  # rebase-and-merge
+PR_2514_MERGE_SHA = "bf6c504f4f3db50457a04340d9f49f2dfc6c94c8"  # squash-merge
+
+
+class TestGetPatchRangeWithMocks:
+    """Test _get_patch_range with mocked git (no repo required)."""
+
+    def test_squash_merge_one_parent_returns_parent_and_merge(self):
+        # One parent: squash or rebase-and-merge → range = parent..merge
+        from pr_merge_sync_patches import _get_patch_range
+
+        merge_sha = "cccc000000000000000000000000000000000000"
+        parent_sha = "aaaa000000000000000000000000000000000000"
+        rev_list_out = f"{merge_sha} {parent_sha}"
+
+        with patch("pr_merge_sync_patches._run_git", return_value=rev_list_out):
+            base, range_end = _get_patch_range(merge_sha)
+        assert base == parent_sha
+        assert range_end == merge_sha
+
+    def test_merge_commit_two_parents_returns_first_and_second_parent(self):
+        from pr_merge_sync_patches import _get_patch_range
+
+        merge_sha = "cccc000000000000000000000000000000000000"
+        first_parent = "aaaa000000000000000000000000000000000000"
+        second_parent = "bbbb000000000000000000000000000000000000"
+        rev_list_out = f"{merge_sha} {first_parent} {second_parent}"
+
+        with patch("pr_merge_sync_patches._run_git", return_value=rev_list_out):
+            base, range_end = _get_patch_range(merge_sha)
+        assert base == first_parent
+        assert range_end == second_parent
+
+
+def _is_rocm_systems_repo_and_has_commits():
+    """True if cwd looks like rocm-systems and the test merge SHAs exist."""
+    try:
+        root = Path(__file__).resolve().parents[2]  # .github/scripts/tests -> repo root
+        r = subprocess.run(
+            ["git", "rev-parse", "--is-inside-work-tree"],
+            cwd=root,
+            capture_output=True,
+            text=True,
+        )
+        if r.returncode != 0:
+            return False
+        for sha in (PR_3277_MERGE_SHA, PR_2514_MERGE_SHA):
+            r2 = subprocess.run(
+                ["git", "cat-file", "-t", sha],
+                cwd=root,
+                capture_output=True,
+                text=True,
+            )
+            if r2.returncode != 0 or "commit" not in (r2.stdout or ""):
+                return False
+        return True
+    except Exception:
+        return False
+
+
+@pytest.mark.skipif(
+    not _is_rocm_systems_repo_and_has_commits(),
+    reason="Not in rocm-systems repo or merge SHAs (3277/2514) not available",
+)
+class TestGetPatchRangeRealRepo:
+    """Integration tests: real git in rocm-systems repo with known PR merge SHAs."""
+
+    def test_pr_3277_rebase_merge_range(self):
+        """PR 3277 (rebase-and-merge): range = parent..merge, 1 commit in range for rocr-debug-agent."""
+        from pr_merge_sync_patches import _get_patch_range
+
+        base, range_end = _get_patch_range(PR_3277_MERGE_SHA)
+        # Merge commit c6d7e08 has one parent b3e0321
+        assert base.startswith("b3e0321")
+        assert range_end.startswith("c6d7e08")
+
+    def test_pr_2514_squash_merge_range(self):
+        """PR 2514 (squash-merge): range = parent..merge, 1 commit in range."""
+        from pr_merge_sync_patches import _get_patch_range
+
+        base, range_end = _get_patch_range(PR_2514_MERGE_SHA)
+        # Merge bf6c504 has one parent a5b467d
+        assert base.startswith("a5b467d")
+        assert range_end.startswith("bf6c504")
+
+
+def _patch_test_dir():
+    """Temp dir under repo for patch-generation tests (avoids pytest tmp_path permissions)."""
+    root = Path(__file__).resolve().parents[2]
+    return Path(tempfile.mkdtemp(prefix="patch_test_", dir=str(root)))
+
+
+@pytest.mark.skipif(
+    not _is_rocm_systems_repo_and_has_commits(),
+    reason="Not in rocm-systems repo or merge SHAs not available",
+)
+class TestPatchGenerationRealRepo:
+    """Integration tests: generate_patch for known PRs (no apply)."""
+
+    def test_pr_3277_generates_patches_for_rocr_debug_agent(self):
+        """PR 3277 touches projects/rocr-debug-agent: at least one patch, all touch subtree."""
+        from pr_merge_sync_patches import _get_patch_range, generate_patch
+
+        tmp = _patch_test_dir()
+        try:
+            base, range_end = _get_patch_range(PR_3277_MERGE_SHA)
+            prefix = "projects/rocr-debug-agent/"
+            anchor = tmp / "rocr-debug-agent.patch"
+            patch_files = generate_patch(prefix, anchor, base, range_end, debug=False)
+            assert patch_files is not None
+            assert len(patch_files) >= 1
+            for p in patch_files:
+                assert p.exists()
+                content = p.read_text(encoding="utf-8")
+                assert "rocr-debug-agent" in content or "debug_agent" in content
+        finally:
+            shutil.rmtree(tmp, ignore_errors=True)
+
+    def test_pr_2514_generates_patches_for_clr(self):
+        """PR 2514 (squash) touches projects/clr: exactly one patch."""
+        from pr_merge_sync_patches import _get_patch_range, generate_patch
+
+        tmp = _patch_test_dir()
+        try:
+            base, range_end = _get_patch_range(PR_2514_MERGE_SHA)
+            prefix = "projects/clr/"
+            anchor = tmp / "clr.patch"
+            patch_files = generate_patch(prefix, anchor, base, range_end, debug=False)
+            assert patch_files is not None
+            assert len(patch_files) == 1
+            assert patch_files[0].exists()
+        finally:
+            shutil.rmtree(tmp, ignore_errors=True)