Skip to content

Commit 3dac11f

Browse files
committed
[AOMP] Add shellcheck annotation
This patch adds shellcheck 'disable' annotations in several places that aren't wrong, but show up as false positives with the tool.
1 parent 4e77ba3 commit 3dac11f

File tree

5 files changed

+29
-0
lines changed

5 files changed

+29
-0
lines changed

bin/aomp_common_vars

+21
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,15 @@ if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
242242
AOMP_ASAN_ORIGIN_RPATH="-DCMAKE_SHARED_LINKER_FLAGS='-Wl,--disable-new-dtags' -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DCMAKE_INSTALL_RPATH=$AOMP_ASAN_ORIGIN_RPATH_LIST"
243243
# Please note below lines are only setup for ROCm ASan integration with AOMP.
244244
# Relative RUNPATH for ASAN binaries and libraries
245+
# shellcheck disable=2016
245246
OPENMP_EXTRAS_LIB_RPATH='$ORIGIN:$ORIGIN/../../../lib/asan:$ORIGIN/../../../lib:$ORIGIN/../../../../lib/asan:$ORIGIN/../../../../lib'
247+
# shellcheck disable=2016
246248
OPENMP_EXTRAS_EXE_RPATH='$ORIGIN/../lib/asan:$ORIGIN/../lib:$ORIGIN/../../lib/asan:$ORIGIN/../../lib:$ORIGIN/../../../lib/asan:$ORIGIN/../../../lib'
247249
else
248250
# Relative RUNPATH for non-ASAN binaries and libraries
251+
# shellcheck disable=2016
249252
OPENMP_EXTRAS_LIB_RPATH='$ORIGIN:$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib'
253+
# shellcheck disable=2016
250254
OPENMP_EXTRAS_EXE_RPATH='$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib'
251255
fi
252256

@@ -269,10 +273,12 @@ if [ "$AOMP_BUILD_CUDA" == 1 ] ; then
269273
NVPTXGPUS_DEFAULT="35,37,50,52,53,60,61,62,70,72,75,80,86"
270274
# Developers should override NVPTXGPUS to shorten build time.
271275
NVPTXGPUS=${NVPTXGPUS:-"${NVPTXGPUS_DEFAULT}"}
276+
# shellcheck disable=2034
272277
AOMP_NVPTX_TARGET="NVPTX;"
273278
else
274279
NVPTXGPUS_DEFAULT=""
275280
NVPTXGPUS=""
281+
# shellcheck disable=2034
276282
AOMP_NVPTX_TARGET=""
277283
fi
278284

@@ -335,9 +341,11 @@ AOMP_GIT_INTERNAL_IP="git@github-ent"
335341
GITROC="https://github.com/ROCm"
336342
GITGERRIT="ssh://$USER@gerrit-git.amd.com:29418"
337343
GITKHRONOS="https://github.com/KhronosGroup"
344+
# shellcheck disable=2034
338345
GITHWLOC="https://github.com/open-mpi"
339346
GITLIGHTNINGINTERNAL="$AOMP_GIT_INTERNAL_IP:AMD-Lightning-Internal"
340347
GITPROJECT=$GITROCDEV
348+
# shellcheck disable=2034
341349
POWERINFER_REPO="https://github.com/SJTU-IPADS"
342350
if [ "$AOMP_STANDALONE_BUILD" == 1 ]; then
343351
AOMP_PROJECT_REPO_NAME=${AOMP_PROJECT_REPO_NAME:-llvm-project}
@@ -390,32 +398,44 @@ AOMP_PROF_REGISTER_REPO_NAME=${AOMP_PROF_REGISTER_REPO_NAME:-rocprofiler-registe
390398
AOMP_TRACE_REPO_NAME=${AOMP_TRACE_REPO_NAME:-roctracer}
391399

392400
# These are test repositories
401+
# shellcheck disable=2034
393402
GITNEKBONE="https://github.com/AMDComputeLibraries"
394403
AOMP_NEKBONE_REPO_NAME=${AOMP_NEKBONE_REPO_NAME:-Nekbone}
395404
AOMP_APPS_REPO_NAME=${AOMP_APPS_REPO_NAME:-openmpapps}
405+
# shellcheck disable=2034
396406
GITOPENMPVV="https://github.com/OpenMP-Validation-and-Verification"
397407
AOMP_OPENMPVV_REPO_NAME=${AOMP_OPENMPVV_REPO_NAME:-OpenMP_VV}
408+
# shellcheck disable=2034
398409
GITSOLVV="https://github.com/SOLLVE"
399410
AOMP_SOLVV_REPO_NAME=${AOMP_SOLVV_REPO_NAME:-sollve_vv}
400411
AOMP_APPS_REPO_NAME=${AOMP_APPS_REPO_NAME:-openmpapps}
412+
# shellcheck disable=2034
401413
GITLLNL="https://github.com/llnl"
402414
AOMP_RAJA_REPO_NAME=${AOMP_RAJA_REPO_NAME:-raja}
403415
AOMP_RAJAPERF_REPO_NAME=${AOMP_RAJAPERF_REPO_NAME:-RAJAPerf}
416+
# shellcheck disable=2034
404417
GITKOKKOS="https://github.com/kokkos"
405418
AOMP_KOKKOS_REPO_NAME=${AOMP_KOKKOS_REPO_NAME:-kokkos}
406419
AOMP_INTERNAL_IP="gitlab1.amd.com"
420+
# shellcheck disable=2034
407421
GITINTERNAL="http://${AOMP_INTERNAL_IP}/dmcdouga" # This will change soon
422+
# shellcheck disable=2034
408423
GITOVO="https://github.com/TApplencourt"
409424
AOMP_OVO_REPO_NAME=${AOMP_OVO_REPO_NAME:-OvO}
425+
# shellcheck disable=2034
410426
GITOMPTESTS="https://github.com/doru1004"
411427
AOMP_OMPTESTS_REPO_NAME=${AOMP_OMPTESTS_REPO_NAME:-omptests}
428+
# shellcheck disable=2034
412429
GITQMCPACK="https://github.com/QMCPACK"
413430
AOMP_QMCPACK_REPO_NAME=${AOMP_QMCPACK_REPO_NAME:-qmcpack}
431+
# shellcheck disable=2034
414432
GITOPENLIBM="https://github.com/JuliaMath"
415433
AOMP_OPENLIBM_REPO_NAME=${AOMP_OPENLIBM_REPO_NAME:-openlibm}
434+
# shellcheck disable=2034
416435
GITLLNLGOULASH="https://github.com/LLNL"
417436
AOMP_GOULASH_REPO_NAME=${AOMP_GOULASH_REPO_NAME:-goulash}
418437
AOMP_BABELSTREAM_REPO_NAME=${AOMP_BABELSTREAM_REPO_NAME:-babelstream}
438+
# shellcheck disable=2034
419439
GITUMT="https://github.com/LLNL"
420440
AOMP_UMT_REPO_NAME=${AOMP_UMT_REPO_NAME:-UMT}
421441

@@ -448,6 +468,7 @@ fi
448468
# The cmake and make builds are actually done in
449469
# BUILD_AOMP/build, not the actual repos.
450470
BUILD_AOMP=${BUILD_AOMP:-$AOMP_REPOS}
471+
# shellcheck disable=2034
451472
BUILD_DIR=$BUILD_AOMP
452473

453474
# Here is where we define different behaviors for STANDALONE build

bin/build_amdsmi.sh

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
7777

7878
declare -a MYCMAKEOPTS
7979

80+
# shellcheck disable=2016
8081
MYCMAKEOPTS=("$AOMP_ORIGIN_RPATH" -DCMAKE_BUILD_TYPE="$BUILDTYPE"
8182
-DCMAKE_INSTALL_PREFIX="$AOMP_INSTALL_DIR"
8283
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON

bin/build_aomp.sh

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ function build_aomp_component() {
1414

1515
if [[ $osversion =~ \"7\. ]]; then
1616
echo "OS version 7 found $(cat /etc/os-release)"
17+
# shellcheck disable=1091
1718
[ -f /opt/rh/devtoolset-7/enable ] && . /opt/rh/devtoolset-7/enable
1819
elif [[ $osversion =~ \"8\. ]]; then
1920
echo "OS version 8 found $(cat /etc/os-release)"

bin/repeat_fprintf.sh

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ EOF
7474
function run_tests() {
7575
_log=stdout.log
7676
_rc0=0
77+
# Disable warning for unused 'i' variable
78+
# shellcheck disable=2034
7779
for i in $(seq 1 "$_iters") ; do
7880
if $_binary ; then
7981
_rc0=$(( _rc0 + 1 ))

bin/rocm_quick_check.sh

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ fi
3333
echo "Done checking for libnvidia"
3434

3535
if [ -e ~/local/openmpi/lib/libmpi.so ]; then
36+
# We don't care that the tilde isn't expanded
37+
# shellcheck disable=2088
3638
echo "~/local/openmpi/lib/libmpi.so OK"
3739
elif [ -e /opt/openmpi-4.1.5/lib/libmpi.so ]; then
3840
echo "/opt/openmpi-4.1.5/lib/libmpi.so OK"
@@ -76,6 +78,8 @@ SYSFILECHECK=$(latest_filecheck /usr/bin)
7678
if [ "$SYSFILECHECK" == "" ]; then
7779
SYSFILECHECK="FileCheck"
7880
fi
81+
# We don't care about non-alphanumeric filenames here.
82+
# shellcheck disable=2012
7983
AOMP=$(ls -d /opt/rocm-*/llvm | head -1)
8084
echo "$AOMP"
8185
SYSLLVM=$(ls /usr/lib | grep -m1 -e "llvm-[0-9]\+")

0 commit comments

Comments
 (0)