Skip to content

merge aomp-dev into amd-staging #2627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
z1-cciauto wants to merge 3 commits into from
Closed

merge aomp-dev into amd-staging #2627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2b3e81
Fix the warp_id check for GPUs with few CUs
saiislam Oct 12, 2026
0c7036d
[build_supp.sh] buildhdf5 add "-parallel" variant (#2614)
dpalermo Oct 12, 2026
6788fd0
merge aomp-dev into amd-staging
z1-cciauto Oct 16, 2026
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
145 changes: 47 additions & 98 deletions bin/build_supp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,23 @@ function derive_rocm_path(){
return 0
}

function getaompcompiler(){
if [ "$#" -ne "2" ]; then
echo "Usage: ${FUNCNAME[0]} <primary> <fallback>"
return 1
fi
local primary=$1
local fallback=$2
if [ -x "$AOMP/bin/$primary" ]; then
echo "$AOMP/bin/$primary"
elif [ -x "$AOMP/bin/$fallback" ]; then
echo "$AOMP/bin/$fallback"
else
echo "ERROR: Cannot find $primary or $fallback under $AOMP/bin" >&2
return 1
fi
}

################################################################################
# XPMEM - Cross-Process Memory Access for high-performance shared memory
################################################################################
Expand Down Expand Up @@ -573,119 +590,49 @@ function getrocmpackage(){
}

function buildhdf5(){
local _cname="hdf5"
local variant=$1
local _cname="hdf5$variant"
local _version=2.2.0
local _release=hdf5-2.2.0
local _installdir=$AOMP_SUPP_INSTALL/hdf5-$_version
local _linkfrom=$AOMP_SUPP/hdf5
local _builddir=$AOMP_SUPP_BUILD/hdf5
local _installdir=$AOMP_SUPP_INSTALL/$_cname-$_version
local _linkfrom=$AOMP_SUPP/$_cname
local _builddir=$AOMP_SUPP_BUILD/$_cname
BUILD_TYPE=${BUILD_TYPE:-Release}
declare -a MYCMAKEOPTS
MYCMAKEOPTS=(-DCMAKE_BUILD_TYPE="$BUILD_TYPE"
-DCMAKE_INSTALL_PREFIX="$_installdir"
-DCMAKE_CXX_COMPILER="$AOMP/bin/clang++"
-DCMAKE_C_COMPILER="$AOMP/bin/clang"
-DCMAKE_Fortran_COMPILER="$AOMP/bin/flang"
-DHDF5_BUILD_FORTRAN=ON
-DHDF5_BUILD_HL_LIB=ON
-DHDF5_BUILD_TOOLS=ON
-DBUILD_SHARED_LIBS=ON
-DBUILD_STATIC_LIBS=ON
-DHDF5_ENABLE_ZLIB_SUPPORT=ON
-DHDF5_ENABLE_SZIP_SUPPORT=OFF
-DHDF5_ENABLE_THREADSAFE=OFF
-DBUILD_TESTING=OFF
-DHDF5_INSTALL_MOD_FORTRAN=STATIC)

if checkversion "$_cname" "$_version" "$_linkfrom"; then
return
fi

if [ -d "$_builddir" ] ; then
runcmd "rm -rf $_builddir"
fi
runcmd "mkdir -p $_builddir"
runcmd "cd $_builddir"
#runcmd " wget https://support.hdfgroup.org/ftp/HDF5/releases/$_release/hdf5-$_version/src/hdf5-$_version.tar.bz2"
runcmd " wget https://github.com/HDFGroup/hdf5/releases/download/$_version/hdf5-$_version.tar.gz"
runcmd "tar -xzf hdf5-$_version.tar.gz"
runcmd "cd hdf5-$_version"
if [ -d "$_installdir" ] ; then
runcmd "rm -rf $_installdir"
fi
runcmd "mkdir -p $_installdir"
runcmd "mkdir -p build"
runcmd "cd build"
#runcmd "./configure --enable-fortran --prefix=$_installdir"
echo
echo " -----Running cmake ---- "
echo "${AOMP_CMAKE}" "$(shquot "${MYCMAKEOPTS[@]}")" \
"../"
declare -a MYVAROPTS
MYVAROPTS=(-DCMAKE_CXX_COMPILER="$AOMP/bin/clang++"
-DCMAKE_C_COMPILER="$AOMP/bin/clang"
-DCMAKE_Fortran_COMPILER="$AOMP/bin/flang")

if ! ${AOMP_CMAKE} "${MYCMAKEOPTS[@]}" ../; then
echo "ERROR cmake failed. Cmake flags"
echo " $(shquot "${MYCMAKEOPTS[@]}")"
exit 1
fi
runcmd "make -j${AOMP_JOB_THREADS}"
runcmd "make install"
if [ -L "$_linkfrom" ] ; then
runcmd "rm $_linkfrom"
fi
runcmd "ln -sfr $_installdir $_linkfrom"
echo "# $_linkfrom is now symbolic link to $_installdir " >>"$CMDLOGFILE"
}
if [ "$variant" == "-parallel" ]; then
OPENMPI_INSTALL=${OPENMPI_INSTALL:-$AOMP_SUPP/rocmopenmpi}

function getaompcompiler(){
if [ "$#" -ne "2" ]; then
echo "Usage: ${FUNCNAME[0]} <primary> <fallback>"
return 1
fi
local primary=$1
local fallback=$2
if [ -x "$AOMP/bin/$primary" ]; then
echo "$AOMP/bin/$primary"
elif [ -x "$AOMP/bin/$fallback" ]; then
echo "$AOMP/bin/$fallback"
else
echo "ERROR: Cannot find $primary or $fallback under $AOMP/bin" >&2
return 1
fi
}
if [ ! -x "$OPENMPI_INSTALL/bin/mpicc" ] || [ ! -x "$OPENMPI_INSTALL/bin/mpifort" ]; then
echo "ERROR: hdf5-parallel requires ROCm-aware OpenMPI at $OPENMPI_INSTALL"
echo " Build it first with: $0 rocmopenmpi"
exit 1
fi

function buildhdf5parallel(){
local _cname="hdf5-parallel"
local _version=2.2.0
local _release=hdf5-2.2.0
local _installdir=$AOMP_SUPP_INSTALL/$_cname-$_version
local _linkfrom=$AOMP_SUPP/$_cname
local _builddir=$AOMP_SUPP_BUILD/$_cname
BUILD_TYPE=${BUILD_TYPE:-Release}
OPENMPI_INSTALL=${OPENMPI_INSTALL:-$AOMP_SUPP/rocmopenmpi}
AOMP_CC=${AOMP_CC:-$(getaompcompiler amdclang clang)}
AOMP_CXX=${AOMP_CXX:-$(getaompcompiler amdclang++ clang++)}
AOMP_FC=${AOMP_FC:-$(getaompcompiler amdflang "$FLANG")}
export OMPI_CC=${OMPI_CC:-$AOMP_CC}
export OMPI_CXX=${OMPI_CXX:-$AOMP_CXX}
export OMPI_FC=${OMPI_FC:-$AOMP_FC}

if [ ! -x "$OPENMPI_INSTALL/bin/mpicc" ] || [ ! -x "$OPENMPI_INSTALL/bin/mpifort" ]; then
echo "ERROR: hdf5-parallel requires ROCm-aware OpenMPI at $OPENMPI_INSTALL"
echo " Build it first with: $0 rocmopenmpi"
exit 1
MYVAROPTS=(-DCMAKE_CXX_COMPILER="$OPENMPI_INSTALL/bin/mpicxx"
-DCMAKE_C_COMPILER="$OPENMPI_INSTALL/bin/mpicc"
-DCMAKE_Fortran_COMPILER="$OPENMPI_INSTALL/bin/mpifort"
-DHDF5_ENABLE_PARALLEL=ON)
fi

AOMP_CC=${AOMP_CC:-$(getaompcompiler amdclang clang)}
AOMP_CXX=${AOMP_CXX:-$(getaompcompiler amdclang++ clang++)}
AOMP_FC=${AOMP_FC:-$(getaompcompiler amdflang "$FLANG")}
export OMPI_CC=${OMPI_CC:-$AOMP_CC}
export OMPI_CXX=${OMPI_CXX:-$AOMP_CXX}
export OMPI_FC=${OMPI_FC:-$AOMP_FC}

declare -a MYCMAKEOPTS
MYCMAKEOPTS=(-DCMAKE_BUILD_TYPE="$BUILD_TYPE"
-DCMAKE_INSTALL_PREFIX="$_installdir"
-DCMAKE_CXX_COMPILER="$OPENMPI_INSTALL/bin/mpicxx"
-DCMAKE_C_COMPILER="$OPENMPI_INSTALL/bin/mpicc"
-DCMAKE_Fortran_COMPILER="$OPENMPI_INSTALL/bin/mpifort"
"${MYVAROPTS[@]}"
-DHDF5_BUILD_FORTRAN=ON
-DHDF5_BUILD_HL_LIB=ON
-DHDF5_BUILD_TOOLS=ON
-DHDF5_ENABLE_PARALLEL=ON
-DBUILD_SHARED_LIBS=ON
-DBUILD_STATIC_LIBS=ON
-DHDF5_ENABLE_ZLIB_SUPPORT=ON
Expand All @@ -703,6 +650,7 @@ function buildhdf5parallel(){
fi
runcmd "mkdir -p $_builddir"
runcmd "cd $_builddir"
#runcmd " wget https://support.hdfgroup.org/ftp/HDF5/releases/$_release/hdf5-$_version/src/hdf5-$_version.tar.bz2"
runcmd " wget https://github.com/HDFGroup/hdf5/releases/download/$_version/hdf5-$_version.tar.gz"
runcmd "tar -xzf hdf5-$_version.tar.gz"
runcmd "cd hdf5-$_version"
Expand All @@ -712,6 +660,7 @@ function buildhdf5parallel(){
runcmd "mkdir -p $_installdir"
runcmd "mkdir -p build"
runcmd "cd build"
#runcmd "./configure --enable-fortran --prefix=$_installdir"
echo
echo " -----Running cmake ---- "
echo "${AOMP_CMAKE}" "$(shquot "${MYCMAKEOPTS[@]}")" \
Expand Down Expand Up @@ -966,7 +915,7 @@ for _component in $_components ; do
elif [ "$_component" == "hdf5" ] ; then
buildhdf5
elif [ "$_component" == "hdf5-parallel" ] ; then
buildhdf5parallel
buildhdf5 "-parallel"
elif [ "$_component" == "fftw" ] ; then
buildfftw
elif [ "$_component" == "hwloc" ] ; then
Expand Down
6 changes: 2 additions & 4 deletions test/smoke-limbo/aomp_mappings_newrt/aomp_mappings_newrt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,8 @@ int main()
recordError(&errors, "DEVICE NUMBER", i, default_dev, NULL);

//check warp #
if (i % MAX_TEAMS * num_threads[i] == 0){
correctWarpId++;
correctWarpId = correctWarpId % (MAX_THREADS_PER_TEAM/WARP_SIZE);
}
// Warp id is local to the team: thread index divided by wavefront size.
correctWarpId = thread_num[i] / WARP_SIZE;
if (warp_id[i] != correctWarpId)
recordError(&errors, "WARP NUMBER", i, warp_id, NULL);

Expand Down
Loading