Merge ~bullwinkle-team/ubuntu/+source/roctracer:bullwinkle/llvm-21/ubuntu/devel into ubuntu/+source/roctracer:ubuntu/devel

[Igor Luppi]

Update to upstream v7.1.0

[Igor Luppi (igorluppi)]

ubuntu@resolute-21:~$ reverse-depends src:roctracer -x
Reverse-Depends
===============
* libmiopen1 [amd64 amd64v3 arm64]
  * libmiopen-dev [amd64 amd64v3 arm64]
  * libmiopen1-tests [amd64 amd64v3 arm64]
* librocblas4 [amd64 amd64v3 arm64]
  * librocblas-dev [amd64 amd64v3 arm64]
  * libhipsolver0 [amd64 amd64v3 arm64]
  * librocsolver0 [amd64 amd64v3 arm64]
  * librocsolver0-tests [amd64 amd64v3 arm64]
  * libmiopen1 [amd64 amd64v3 arm64]
  * libmiopen1-tests [amd64 amd64v3 arm64]
  * librocsolver0-bench [amd64 amd64v3 arm64]
  * libhipblas2 [amd64 amd64v3 arm64]
  * librocblas4-bench [amd64 amd64v3 arm64]
  * librocblas4-tests [amd64 amd64v3 arm64]

Packages without architectures listed are reverse-dependencies in: amd64, amd64v3, arm64, ppc64el
ubuntu@resolute-21:~$ reverse-depends --arch ppc64el src:roctracer -x
No reverse dependencies found

Safe to drop ppc64el

[Igor Luppi (igorluppi)]

build in ppa: https://launchpad.net/~igorluppi/+archive/ubuntu/roctracer-lp2140348

(-proposed and all archs)

[Frank Heimes (fheimes)]

Hello Igor, the MR looks pretty good.
It builds fine, lintian is happy if ran on the src and the bins,
licensecheck also didn't found additionally licensed files.

Only request I have is a change of d/changelog,
since it misses a reference to the LP bug.
And while changing it, you could also update the version from 7.1.0-0ubuntu3~ppa1 to just 7.1.0-0ubuntu3 (skipping the ~ppa1 suffix, that would be needed to removed anyway before uploading).

So it should roughly look like:
"
roctracer (7.1.0-0ubuntu3) resolute; urgency=medium

  * Initial release. (LP: #2140348)
  * d/control: remove ppc64el builds

 -- Igor Luppi <email address hidden> Wed, 28 Jan 2026 17:01:32 -0300
"
After this the package seems to be ready to be sponsored.

review: Needs Fixing

[Frank Heimes (fheimes)]

I noticed that this is not a brand new package upload ([needs-uploading]) rather than a version bump for the current development release.

In this case d/changelog should still have the LP bug reference, for example like this:
roctracer | 6.4.1-1 | resolute/universe | source
(I should have better checked that)

so the changelog should be:
"
roctracer (7.1.0-0ubuntu3) resolute; urgency=medium

  * New upstream release (LP: #2140348)
  * d/control: remove ppc64el builds
 -- Igor Luppi <email address hidden> Wed, 28 Jan 2026 17:01:32 -0300
"

[Igor Luppi (igorluppi)]

Thanks a lot Frank for the review!

Updated accordingly. Included the bug mention in the New upstream version changelog. Also used the opportunity to fix the UNRELEASED changelogs as well.

[Igor Luppi (igorluppi)]

Just an update since the MP still as 'needs review':

Roctracer was already merged by git-ubuntu-import https://code.launchpad.net/~git-ubuntu-import/ubuntu/+source/roctracer/+git/roctracer/+ref/ubuntu/devel

[Andreas Hasenack (ahasenack)]

This is in resolute-proposed already, marking as merged.

[Igor Luppi (igorluppi)]

Thanks Andreas

diff --git a/.azuredevops/rocm-ci.yml b/.azuredevops/rocm-ci.yml
index accd3da..87826af 100644
--- a/.azuredevops/rocm-ci.yml
+++ b/.azuredevops/rocm-ci.yml
@@ -13,7 +13,7 @@ trigger:
   batch: true
   branches:
     include:
-    - amd-master
+    - amd-mainline
     - amd-staging
   paths:
     exclude:
@@ -26,7 +26,7 @@ pr:
   autoCancel: true
   branches:
     include:
-    - amd-master
+    - amd-mainline
     - amd-staging
   paths:
     exclude:
diff --git a/.github/workflows/kws-caller.yml b/.github/workflows/kws-caller.yml
deleted file mode 100644
index ffcbff7..0000000
--- a/.github/workflows/kws-caller.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Rocm Validation Suite KWS
-on:
-  push:
-    branches: [amd-staging]
-  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
deleted file mode 100644
index 72533ca..0000000
--- a/.github/workflows/rocm-ci-caller.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: ROCm CI Caller
-  
-on:  
-  pull_request:  
-    branches: [release/rocm-rel-6.4]  
-    types: [opened, reopened, synchronize]  
-  workflow_dispatch:  
-  
-jobs:  
-  call-workflow:  
-    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 || '' }}  
-      repository_name: ${{ github.repository }}  
-      base_ref: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref }}  
-      trigger_event_type: ${{ github.event_name }} 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32ab0ce..2b858d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ endif()
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-add_compile_options(-Wall -Werror)
+add_compile_options(-Wall -Wno-error=ignored-attributes -Werror)
 # To set addition RUNPATH in libraries
 # installed in /opt/rocm-ver/lib/roctracer
 set(ROCM_APPEND_PRIVLIB_RPATH "$ORIGIN/..")
@@ -91,7 +91,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(CPACK_PACKAGE_CONTACT "ROCm Profiler Support <[e-mail]>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD ROCTRACER library")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
 
 if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
   set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}.$ENV{ROCM_LIBPATCH_VERSION}")
diff --git a/LICENSE b/LICENSE.md
similarity index 58%
rename from LICENSE
rename to LICENSE.md
index e4103ac..4d43ac8 100644
--- a/LICENSE
+++ b/LICENSE.md
@@ -1,5 +1,6 @@
-Copyright (c) 2018-2025 Advanced Micro Devices, Inc. All rights reserved.
-[MITx11 License]
+MIT License
+
+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
@@ -8,13 +9,13 @@ 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 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
+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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/debian/changelog b/debian/changelog
index 1dced5a..aac25cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+roctracer (7.1.0-0ubuntu3) resolute; urgency=medium
+
+  * d/control: remove ppc64el builds
+
+ -- Igor Luppi <[e-mail]>  Wed, 28 Jan 2026 17:01:32 -0300
+
+roctracer (7.1.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/{control, rules}: update build dependencies to use upstream llvm-21
+
+ -- Talha Can Havadar <[e-mail]>  Fri, 19 Dec 2025 16:46:38 +0100
+
+roctracer (7.1.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Zhai Zhaoxuan ]
+  * chore: New upstream version 7.1.0 (LP: #2140348)
+  * d/copyright: fix license
+  * d/control: update build dependencies
+  * d/rules: include llvm-toolchain-rocm path
+  * d/not-installed: fix the path of new LICENSE file
+  * d/p/0001-optional-werror.patch: update for v7.1.0
+
+  [ Igor Luppi ]
+  * d/patches/{0002,0003}: refresh patches indexes
+
+ -- Igor Luppi <[e-mail]>  Tue, 02 Dec 2025 19:07:25 -0300
+
+roctracer (6.4.3-0ubuntu2) resolute; urgency=medium
+
+  * d/control: update build-deps to use the 7.1 AMD compiler
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 25 Nov 2025 10:05:07 -0300
+
+roctracer (6.4.3-0ubuntu1) questing; urgency=medium
+
+  * New upstream version 6.4.3 (no changes needed)
+  * d/control: update maintainer field for ubuntu archive
+  * d/control: update build-deps for llvm-toolchain-rocm
+
+ -- Igor Luppi <[e-mail]>  Wed, 01 Oct 2025 15:53:40 -0300
+
 roctracer (6.4.1-1) unstable; urgency=medium
 
   [ Cordell Bloor ]
diff --git a/debian/control b/debian/control
index de7fcdd..9b301e9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,19 +5,25 @@ Priority: optional
 Standards-Version: 4.7.2
 Vcs-Git: https://salsa.debian.org/rocm-team/roctracer.git
 Vcs-Browser: https://salsa.debian.org/rocm-team/roctracer
-Maintainer: Debian ROCm Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian ROCm Team <[e-mail]>
 Uploaders: Cordell Bloor <[e-mail]>,
            Christian Kastner <[e-mail]>,
 Rules-Requires-Root: no
 Build-Depends: debhelper-compat (= 13),
+               clang-format,
+               clang-tidy,
                cmake,
+               hip-utils,
+               llvm-dev,
                libhsa-runtime-dev,
                libamdhip64-dev,
+               rocm-device-libs-21,
                python3
 
 Package: libroctx64-4
 Section: libs
-Architecture: amd64 arm64 ppc64el
+Architecture: amd64 arm64
 Depends: ${misc:Depends}, ${shlibs:Depends},
 Description: ROCm library for profiler annotations - library
  The ROC-TX library provides functions can be used to add information
@@ -29,7 +35,7 @@ Description: ROCm library for profiler annotations - library
 
 Package: libroctx-dev
 Section: libdevel
-Architecture: amd64 arm64 ppc64el
+Architecture: amd64 arm64
 Depends: libroctx64-4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: ROCm library for profiler annotations - headers
  The ROC-TX library provides functions can be used to add information
diff --git a/debian/copyright b/debian/copyright
index a82b5cd..99f4f09 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,14 +3,33 @@ Upstream-Name: roctracer
 Source: https://github.com/ROCm/roctracer
 
 Files: *
-Copyright: 2015-2016, 2018-2024, Advanced Micro Devices, Inc.
-License: Expat
+Copyright: Copyright (c) 2018-2025 Advanced Micro Devices, Inc.
+License: MIT
 
 Files: debian/*
 Copyright: 2024-2025, Cordell Bloor <[e-mail]>
            2025, Christian Kastner <[e-mail]>
 License: Expat
 
+License: MIT
+ 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.
+
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
diff --git a/debian/not-installed b/debian/not-installed
index d115745..db460d0 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +1 @@
-usr/share/doc/roctracer*/LICENSE
+usr/share/doc/roctracer*/LICENSE.md
diff --git a/debian/patches/0001-optional-werror.patch b/debian/patches/0001-optional-werror.patch
index 8692101..10abf3b 100644
--- a/debian/patches/0001-optional-werror.patch
+++ b/debian/patches/0001-optional-werror.patch
@@ -9,20 +9,19 @@ Forwarded: https://github.com/ROCm/roctracer/pull/107
  CMakeLists.txt | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14efcbb..4f22f67 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -37,7 +37,11 @@ endif()
+@@ -42,7 +42,12 @@
  
  set(CMAKE_CXX_STANDARD 17)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
--add_compile_options(-Wall -Werror)
-+add_compile_options(-Wall)
+-add_compile_options(-Wall -Wno-error=ignored-attributes -Werror)
++add_compile_options(-Wall -Wno-error=ignored-attributes)
 +option(ROCTRACER_WERROR "Treat warnings as errors" ON)
 +if(ROCTRACER_WERROR)
 +  add_compile_options(-Werror)
 +endif()
++
  # To set addition RUNPATH in libraries
  # installed in /opt/rocm-ver/lib/roctracer
  set(ROCM_APPEND_PRIVLIB_RPATH "$ORIGIN/..")
diff --git a/debian/patches/0002-disable-tests.patch b/debian/patches/0002-disable-tests.patch
index 6f734d5..51685ca 100644
--- a/debian/patches/0002-disable-tests.patch
+++ b/debian/patches/0002-disable-tests.patch
@@ -9,11 +9,11 @@ Forwarded: not-needed
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f22f67..eb783a8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,7 +60,7 @@ endif()
+Index: roctracer/CMakeLists.txt
+===================================================================
+--- roctracer.orig/CMakeLists.txt
++++ roctracer/CMakeLists.txt
+@@ -66,7 +66,7 @@
  add_subdirectory(src)
  
  ## Build tests
diff --git a/debian/patches/0003-optional-roctracer64.patch b/debian/patches/0003-optional-roctracer64.patch
index 61dab83..b66db28 100644
--- a/debian/patches/0003-optional-roctracer64.patch
+++ b/debian/patches/0003-optional-roctracer64.patch
@@ -11,11 +11,11 @@ Forwarded: No
  src/CMakeLists.txt | 28 +++++++++++++++++-----------
  2 files changed, 22 insertions(+), 12 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb783a8..9cec6de 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,6 +56,8 @@ if(NOT DEFINED LIBRARY_TYPE)
+Index: roctracer/CMakeLists.txt
+===================================================================
+--- roctracer.orig/CMakeLists.txt	2025-12-16 13:42:54.709995318 -0300
++++ roctracer/CMakeLists.txt	2025-12-16 13:42:54.704578626 -0300
+@@ -62,6 +62,8 @@
    set(LIBRARY_TYPE SHARED)
  endif()
  
@@ -24,7 +24,7 @@ index eb783a8..9cec6de 100644
  ## Build libraries
  add_subdirectory(src)
  
-@@ -65,7 +67,9 @@ if(FALSE)
+@@ -71,7 +73,9 @@
  endif()
  
  ## Build Plugins
@@ -35,11 +35,11 @@ index eb783a8..9cec6de 100644
  
  if(${LIBRARY_TYPE} STREQUAL SHARED)
  
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 8714e11..c0d2d9f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -31,6 +31,7 @@ if(DEBUG_TRACE)
+Index: roctracer/src/CMakeLists.txt
+===================================================================
+--- roctracer.orig/src/CMakeLists.txt
++++ roctracer/src/CMakeLists.txt
+@@ -31,6 +31,7 @@
    add_compile_definitions(DEBUG_TRACE_ON=1)
  endif()
  
@@ -47,7 +47,7 @@ index 8714e11..c0d2d9f 100644
  find_package(Python3 COMPONENTS Interpreter REQUIRED)
  
  execute_process(COMMAND ${Python3_EXECUTABLE} -c "import CppHeaderParser"
-@@ -91,17 +92,20 @@ add_custom_command(
+@@ -91,17 +92,20 @@
    DEPENDS ${PROJECT_SOURCE_DIR}/script/gen_ostream_ops.py "${HIP_RUNTIME_API_H}"
    COMMENT "Generating hip_ostream_ops.h..."
    COMMAND_EXPAND_LISTS)
@@ -78,7 +78,7 @@ index 8714e11..c0d2d9f 100644
  
  foreach(header ${PUBLIC_HEADERS})
    get_filename_component(header_subdir ${header} DIRECTORY)
-@@ -110,6 +114,7 @@ foreach(header ${PUBLIC_HEADERS})
+@@ -110,6 +114,7 @@
            COMPONENT dev)
  endforeach()
  
@@ -86,7 +86,7 @@ index 8714e11..c0d2d9f 100644
  set(GENERATED_HEADERS
    hip_ostream_ops.h
    hsa_prof_str.h
-@@ -179,6 +184,7 @@ install(TARGETS roctracer LIBRARY
+@@ -179,6 +184,7 @@
  install(TARGETS roctracer LIBRARY
    DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT asan)
@@ -94,7 +94,7 @@ index 8714e11..c0d2d9f 100644
  
  ## Build the ROCTX library
  file(GLOB ROCTX_SOURCES "roctx/*.cpp")
-@@ -211,7 +217,7 @@ install(TARGETS roctx LIBRARY
+@@ -211,7 +217,7 @@
    COMPONENT asan)
  
  ## Build the tracer_tool library
diff --git a/debian/rules b/debian/rules
index 453e79c..8968828 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export VERBOSE=1
 CMAKE_FLAGS = \
 	-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF \
 	-DBUILD_ROCTRACER64=OFF \
-	-DROCTRACER_WERROR=OFF
+	-DROCTRACER_WERROR=OFF 
 
 %:
 	dh $@
diff --git a/header_template.hpp.in b/header_template.hpp.in
deleted file mode 100644
index 627fefd..0000000
--- a/header_template.hpp.in
+++ /dev/null
@@ -1,43 +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.
-   */
-
-#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 roctracer"
-#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 roctracer"
-#else
-#pragma message("This file is deprecated. Use file from include path /opt/rocm-ver/include/ and prefix with roctracer")
-#endif
-#endif /* ROCM_HEADER_WRAPPER_WERROR */
-
-@include_statements@
-
-#endif
-
-@original_contents@
diff --git a/roctracer-backward-compat.cmake b/roctracer-backward-compat.cmake
deleted file mode 100644
index 36b49ea..0000000
--- a/roctracer-backward-compat.cmake
+++ /dev/null
@@ -1,116 +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(ROCT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
-set(ROCT_WRAPPER_DIR ${ROCT_BUILD_DIR}/wrapper_dir)
-set(ROCT_WRAPPER_INC_DIR ${ROCT_WRAPPER_DIR}/include)
-set(ROCT_WRAPPER_LIB_DIR ${ROCT_WRAPPER_DIR}/lib)
-#set(ROCT_WRAPPER_TOOL_DIR ${ROCT_WRAPPER_DIR}/tool)
-
-#Function to set actual file contents in wrapper files
-#Some components grep for the contents in the file
-function(set_file_contents input_file)
-    set(hashzero_check "#if 0  //Area for original file dump\n
-/* The following is a copy of the original file for the benefit of build systems which grep for values
- * in this file rather than preprocess it. This is just for backward compatibility */")
-
-    file(READ ${input_file} file_contents)
-    set(original_contents "${hashzero_check}\n
-${file_contents}
-#endif")
-    get_filename_component(file_name ${input_file} NAME)
-    configure_file(${PROJECT_SOURCE_DIR}/header_template.hpp.in ${ROCT_WRAPPER_INC_DIR}/${file_name})
-endfunction()
-
-#use header template file and generate wrapper header files
-function(generate_wrapper_header)
-  file(MAKE_DIRECTORY ${ROCT_WRAPPER_INC_DIR}/ext)
-  #Get the header files from PUBLIC_HEADERS variable
-  foreach(header_file ${PUBLIC_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 "ROCTRACER_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H")
-    #set include statements
-    get_filename_component(file_name ${header_file} NAME)
-    get_filename_component ( header_subdir ${header_file} DIRECTORY )
-    if(header_subdir)
-      set(include_statements "#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${header_subdir}/${file_name}\"\n")
-      configure_file(${PROJECT_SOURCE_DIR}/header_template.hpp.in ${ROCT_WRAPPER_INC_DIR}/${header_subdir}/${file_name})
-    else()
-      set(include_statements "#include \"../../${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${file_name}\"\n")
-      if(${file_name} STREQUAL "roctracer.h")
-        set_file_contents(${PROJECT_SOURCE_DIR}/inc/${file_name})
-      else()
-        configure_file(${PROJECT_SOURCE_DIR}/header_template.hpp.in ${ROCT_WRAPPER_INC_DIR}/${file_name})
-      endif()
-    endif()
-  endforeach()
-
-  foreach(header_file ${GENERATED_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 "ROCTRACER_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H")
-    #set include statements
-    get_filename_component(file_name ${header_file} NAME)
-    set(include_statements "#include \"../../${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${file_name}\"\n")
-    configure_file(${PROJECT_SOURCE_DIR}/header_template.hpp.in ${ROCT_WRAPPER_INC_DIR}/${file_name})
-
-  endforeach()
-
-endfunction()
-
-#function to create symlink to libraries
-function(create_library_symlink)
-  file(MAKE_DIRECTORY ${ROCT_WRAPPER_LIB_DIR})
-  set(LIB_ROCT "libroctracer64.so")
-  set(MAJ_VERSION "${PROJECT_VERSION_MAJOR}")
-  set(SO_VERSION "${PROJECT_VERSION}")
-  set(library_files "${LIB_ROCT}")  #"${LIB_ROCT}.${MAJ_VERSION}" "${LIB_ROCT}.${SO_VERSION}")
-
-  set(LIB_ROCTX64 "libroctx64.so")
-  set(library_files "${library_files}" "${LIB_ROCTX64}") # "${LIB_ROCTX64}.${MAJ_VERSION}" "${LIB_ROCTX64}.${SO_VERSION}" )
-
-  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} ${ROCT_WRAPPER_LIB_DIR}/${file_name})
-  endforeach()
-  #set softlink for roctracer/tool/libtracer_tool.so
-  #The libray name is changed to libroctracer_tool.so with file reorg changes
-  #file(MAKE_DIRECTORY ${ROCT_WRAPPER_TOOL_DIR})
-  #set(LIB_TRACERTOOL "libtracer_tool.so")
-  #set(LIB_ROCTRACERTOOL "libroctracer_tool.so")
-  #add_custom_target(link_${LIB_TRACERTOOL} ALL
-  #                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  #                COMMAND ${CMAKE_COMMAND} -E create_symlink
-  #                ../../lib/${PROJECT_NAME}/${LIB_ROCTRACERTOOL} ${ROCT_WRAPPER_TOOL_DIR}/${LIB_TRACERTOOL})
-endfunction()
-
-#Use template header file and generater wrapper header files
-generate_wrapper_header()
-install(DIRECTORY ${ROCT_WRAPPER_INC_DIR} DESTINATION ${PROJECT_NAME} COMPONENT dev)
-create_library_symlink()
-install(DIRECTORY ${ROCT_WRAPPER_LIB_DIR} DESTINATION ${PROJECT_NAME} COMPONENT dev)
-#install soft link to tool
-#install(DIRECTORY ${ROCT_WRAPPER_TOOL_DIR} DESTINATION ${PROJECT_NAME})
diff --git a/script/gen_ostream_ops.py b/script/gen_ostream_ops.py
index 9b45cb4..dcc9914 100755
--- a/script/gen_ostream_ops.py
+++ b/script/gen_ostream_ops.py
@@ -241,6 +241,8 @@ def gen_cppheader(infilepath, outfilepath, rank):
             continue
         if c == 'max_align_t' or c == '__fsid_t': # Skipping as it is defined in multiple domains
           continue
+        if c.startswith("_") or c.startswith("pthread_") or c.startswith("__pthread_"):
+          continue
         if len(cppHeader.classes[c]["properties"]["public"]) != 0:
           output_filename_h.write("inline static std::ostream& operator<<(std::ostream& out, const " + c + "& v)\n")
           output_filename_h.write("{\n")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c15c4d..eeb90c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -243,23 +243,3 @@ install(TARGETS hip_stats LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_
 install(TARGETS hip_stats LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME} COMPONENT asan)
 
 endif()
-
-option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" OFF)
-
-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(${PROJECT_SOURCE_DIR}/roctracer-backward-compat.cmake)
-endif()