Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/rocprofiler-systems-build-group.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
-DROCPROFSYS_BUILD_EXAMPLES=ON
-DROCPROFSYS_USE_PYTHON=ON
-DROCPROFSYS_BUILD_DYNINST=ON
-DROCPROFSYS_BUILD_TBB=ON
-DROCPROFSYS_BUILD_ELFUTILS=ON
-DROCPROFSYS_BUILD_LIBIBERTY=ON
-DROCPROFSYS_MAX_THREADS=64
Expand Down Expand Up @@ -369,7 +368,7 @@ jobs:

# ──────────────────────────────────────────────────────────────────────────
# System-dependency builds: validate that system-provided libs substitute
# for the bundled ones (BUILD_{TBB,ELFUTILS,LIBIBERTY}=OFF).
# for the bundled ones (BUILD_{ELFUTILS,LIBIBERTY}=OFF).
# Matrix entries are filtered to the selected distro group.
# ──────────────────────────────────────────────────────────────────────────
system-deps:
Expand Down Expand Up @@ -403,7 +402,6 @@ jobs:
-DROCPROFSYS_BUILD_EXAMPLES=ON
-DROCPROFSYS_USE_PYTHON=ON
-DROCPROFSYS_BUILD_DYNINST=ON
-DROCPROFSYS_BUILD_TBB=OFF
-DROCPROFSYS_BUILD_ELFUTILS=OFF
-DROCPROFSYS_BUILD_LIBIBERTY=OFF
-DROCPROFSYS_BUILD_HIDDEN_VISIBILITY=ON
Expand Down Expand Up @@ -469,7 +467,6 @@ jobs:
max_attempts: 5
shell: bash
command: |
dnf install -y --enablerepo=crb tbb-devel
dnf install -y binutils-devel
dnf clean all

Expand All @@ -496,7 +493,7 @@ jobs:
git config --global --add safe.directory ${PWD}
echo "CMake: $(cmake --version | head -n 1)"
echo "Compiler: $(${{ matrix.compiler }} --version | head -n 1)"
echo "Testing build with SYSTEM dependencies (ROCPROFSYS_BUILD_{TBB,ELFUTILS,LIBIBERTY}=OFF)"
echo "Testing build with SYSTEM dependencies (ROCPROFSYS_BUILD_{ELFUTILS,LIBIBERTY}=OFF)"
python3 ./scripts/run-ci.py --stage generate \
--name "${{ github.repository_owner }}-${{ github.ref_name }}-${{ matrix.cdash_suffix }}" \
--build-jobs $(nproc) \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/rocprofiler-systems-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ jobs:
-DROCPROFSYS_BUILD_TESTING=OFF \
-DROCPROFSYS_USE_PYTHON=ON \
-DROCPROFSYS_BUILD_DYNINST=ON \
-DROCPROFSYS_BUILD_TBB=ON \
-DROCPROFSYS_BUILD_ELFUTILS=ON \
-DROCPROFSYS_BUILD_LIBIBERTY=ON \
-DROCPROFSYS_PYTHON_PREFIX=/opt/conda/envs \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rocprofiler-systems-code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
apt-get remove -y --purge 'libopenmpi-dev' 'libopenmpi3' 'openmpi-bin' 'openmpi-common' &&
apt-get autoremove -y --purge &&
apt-get upgrade -y &&
apt-get install -y libomp-dev libtbb-dev \
apt-get install -y libomp-dev \
libdw-dev libdwarf-dev libelf-dev libiberty-dev \
libmpich-dev mpich &&
apt-get autoclean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ jobs:
-DCMAKE_PREFIX_PATH=${{ env.ROCM_PATH }} \
-DCMAKE_INSTALL_PREFIX=/opt/rocprofiler-systems \
-DROCPROFSYS_BUILD_DYNINST=ON \
-DROCPROFSYS_BUILD_TBB=ON \
-DROCPROFSYS_BUILD_ELFUTILS=ON \
-DROCPROFSYS_BUILD_LIBIBERTY=ON \
-DROCPROFSYS_BUILD_CI=ON \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
build-essential bzip2 chrpath cmake curl environment-modules flex gettext \
git-core gnupg2 gzip iproute2 libboost-all-dev libdw-dev libdwarf-dev \
libelf-dev libgmock-dev libgtest-dev libiberty-dev libpapi-dev libpfm4-dev \
libsqlite3-dev libtbb-dev libtool locales lsb-release m4 ninja-build \
libsqlite3-dev libtool locales lsb-release m4 ninja-build \
nlohmann-json3-dev python3-pip software-properties-common unzip wget \
vim zip zlib1g-dev libucx-dev ucx-utils libomp-dev libopenmpi-dev &&
apt-get autoclean
Expand Down Expand Up @@ -178,7 +178,6 @@ jobs:
${SANITIZER_CMAKE_FLAGS} \
-DROCPROFSYS_BUILD_DYNINST=${{ matrix.build-dyninst }} \
-DROCPROFSYS_BUILD_BOOST=OFF \
-DROCPROFSYS_BUILD_TBB=OFF \
-DROCPROFSYS_BUILD_ELFUTILS=OFF \
-DROCPROFSYS_BUILD_LIBIBERTY=OFF \
-DROCPROFSYS_MAX_THREADS=64 \
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@
[submodule "projects/rocprofiler-compute/src/vendored/pyyaml"]
path = projects/rocprofiler-compute/src/vendored/pyyaml
url = https://github.com/yaml/pyyaml.git
[submodule "projects/rocprofiler-systems/external/onetbb"]
path = projects/rocprofiler-systems/external/onetbb
url = https://github.com/uxlfoundation/oneTBB.git
tag = v2022.3.0
[submodule "projects/rocprofiler-sdk/external/abseil-cpp"]
path = projects/rocprofiler-sdk/external/abseil-cpp
url = https://github.com/abseil/abseil-cpp.git
Expand Down
12 changes: 6 additions & 6 deletions projects/rocprofiler-systems/.github/ci-build-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
"install_prefix": "/opt/rocprofiler-systems",
"sanity_check_rocm": true,
"ccache_key_distro": "ubuntu-jammy-system-deps",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libtbb-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"group": "ubuntu-22.04"
},
{
Expand All @@ -477,7 +477,7 @@
"install_prefix": "/opt/rocprofiler-systems",
"sanity_check_rocm": true,
"ccache_key_distro": "ubuntu-jammy-system-deps",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libtbb-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"group": "ubuntu-22.04"
},
{
Expand All @@ -493,7 +493,7 @@
"install_prefix": "/opt/rocprofiler-systems",
"sanity_check_rocm": true,
"ccache_key_distro": "ubuntu-noble-system-deps",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libtbb-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"group": "ubuntu-24.04"
},
{
Expand All @@ -509,7 +509,7 @@
"install_prefix": "/opt/rocprofiler-systems",
"sanity_check_rocm": true,
"ccache_key_distro": "ubuntu-noble-system-deps",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libtbb-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"group": "ubuntu-24.04"
},
{
Expand All @@ -525,7 +525,7 @@
"install_prefix": "/opt/rocprofiler-systems",
"sanity_check_rocm": true,
"ccache_key_distro": "debian-system-deps",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libtbb-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"group": "debian"
},
{
Expand All @@ -541,7 +541,7 @@
"install_prefix": "/opt/rocprofiler-systems",
"sanity_check_rocm": true,
"ccache_key_distro": "debian-system-deps",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libtbb-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"system_deps_apt": "g++ binutils-dev libboost-all-dev libdw-dev libdwarf-dev libelf-dev libiberty-dev",
"group": "debian"
},
{
Expand Down
3 changes: 0 additions & 3 deletions projects/rocprofiler-systems/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,6 @@ rocprofiler_systems_add_option(ROCPROFSYS_BUILD_ELFUTILS "Build elfutils from su
rocprofiler_systems_add_option(ROCPROFSYS_BUILD_LIBIBERTY "Build libiberty from submodule"
OFF
)
rocprofiler_systems_add_option(ROCPROFSYS_BUILD_TBB "Build tbb from submodule"
OFF
)
rocprofiler_systems_add_option(ROCPROFSYS_BUILD_LIBUNWIND
"Build libunwind from submodule" ON
)
Expand Down
2 changes: 0 additions & 2 deletions projects/rocprofiler-systems/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"ROCPROFSYS_BUILD_DYNINST": "ON",
"ROCPROFSYS_BUILD_ELFUTILS": "ON",
"ROCPROFSYS_BUILD_LIBIBERTY": "ON",
"ROCPROFSYS_BUILD_TBB": "ON",
"ROCPROFSYS_STRIP_LIBRARIES": "OFF",
"ROCPROFSYS_USE_PYTHON": "ON"
},
Expand Down Expand Up @@ -82,7 +81,6 @@
"ROCPROFSYS_BUILD_GTEST": "ON",
"ROCPROFSYS_BUILD_HIDDEN_VISIBILITY": "OFF",
"ROCPROFSYS_BUILD_LIBIBERTY": "OFF",
"ROCPROFSYS_BUILD_TBB": "OFF",
"ROCPROFSYS_BUILD_TESTING": "ON",
"ROCPROFSYS_MAX_THREADS": "64",
"ROCPROFSYS_STRIP_LIBRARIES": "OFF",
Expand Down
5 changes: 2 additions & 3 deletions projects/rocprofiler-systems/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,8 @@ rm -rf rocprof-sys-build
cmake -B rocprof-sys-build -S . \
-D CMAKE_INSTALL_PREFIX=/opt/rocprofiler-systems \
-D ROCPROFSYS_USE_PYTHON=ON -D ROCPROFSYS_BUILD_DYNINST=ON \
-D ROCPROFSYS_BUILD_TBB=ON -D ROCPROFSYS_BUILD_ELFUTILS=ON \
-D ROCPROFSYS_BUILD_LIBIBERTY=ON -D ROCPROFSYS_BUILD_EXAMPLES=ON \
-D ROCPROFSYS_BUILD_TESTING=ON
-D ROCPROFSYS_BUILD_ELFUTILS=ON -D ROCPROFSYS_BUILD_LIBIBERTY=ON \
-D ROCPROFSYS_BUILD_EXAMPLES=ON -D ROCPROFSYS_BUILD_TESTING=ON
cmake --build rocprof-sys-build --target all --parallel 8
cmake --build rocprof-sys-build --target install
source /opt/rocprofiler-systems/share/rocprofiler-systems/setup-env.sh
Expand Down
3 changes: 0 additions & 3 deletions projects/rocprofiler-systems/cmake/ConfigCPack.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,6 @@ if(NOT ROCPROFSYS_BUILD_DYNINST)
"libboost-${_BOOST_COMPONENT}-dev (>= 1.67.0)"
)
endforeach()
if(NOT ROCPROFSYS_BUILD_TBB)
list(APPEND _DEBIAN_PACKAGE_DEPENDS "libtbb-dev (>= 2018.6)")
endif()
if(NOT ROCPROFSYS_BUILD_LIBIBERTY)
list(APPEND _DEBIAN_PACKAGE_DEPENDS "libiberty-dev (>= 20170913)")
endif()
Expand Down
14 changes: 2 additions & 12 deletions projects/rocprofiler-systems/cmake/DyninstExternals.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# This module:
# - Maps deprecated DYNINST_BUILD_* variables to ROCPROFSYS_BUILD_* variables
# - Sets up TPL_STAGING_PREFIX for third-party library installation
# - Includes and configures Dyninst dependencies (TBB, ElfUtils, LibIberty)
# - Includes and configures Dyninst dependencies (ElfUtils, LibIberty)
# - Creates build targets with serialized dependency chains
# - Creates external-prebuild and external-deps-complete targets for coordination
#
Expand All @@ -20,7 +20,7 @@
include(MacroUtilities)

# Map deprecated DYNINST_BUILD_* variables to new ROCPROFSYS_BUILD_* variables
foreach(dep TBB ELFUTILS LIBIBERTY)
foreach(dep ELFUTILS LIBIBERTY)
if(DYNINST_BUILD_${dep})
message(
WARNING
Expand All @@ -41,16 +41,6 @@ file(MAKE_DIRECTORY "${TPL_STAGING_PREFIX}/include")
add_custom_target(external-prebuild)

# Add external dependencies to be built
include(DyninstTBB)
if(TARGET rocprofiler-systems-tbb-build AND TARGET external-prebuild)
# Make TBB build serially
set_target_properties(
rocprofiler-systems-tbb-build
PROPERTIES JOB_POOL_COMPILE external_deps_pool JOB_POOL_LINK external_deps_pool
)
add_dependencies(external-prebuild rocprofiler-systems-tbb-build)
endif()

include(DyninstElfUtils)
if(TARGET rocprofiler-systems-elfutils-build AND TARGET external-prebuild)
set_target_properties(
Expand Down
Loading
Loading