From d2e4a18f110f17eaa0d84560f21794596785706b Mon Sep 17 00:00:00 2001 From: akolliasAMD <99202231+akolliasAMD@users.noreply.github.com> Date: Fri, 4 Jul 2025 13:28:59 -0600 Subject: [PATCH] changed the function tests name on the codebase (#177) [ROCm/rocshmem commit: ebd92a7b3c10db28ab9ffc8691fa7449696745f5] --- projects/rocshmem/README.md | 2 +- .../rocshmem/scripts/build_configs/codecov | 22 +++++++++++-------- .../scripts/functional_tests/driver.py | 2 +- .../rocshmem/scripts/functional_tests/gdbrun | 2 +- .../shmem_allLib_build_and_test.sh | 14 ++++++------ 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/projects/rocshmem/README.md b/projects/rocshmem/README.md index 5c744141fb..0883cae860 100644 --- a/projects/rocshmem/README.md +++ b/projects/rocshmem/README.md @@ -148,7 +148,7 @@ To run the tests, you may use the driver scripts provided in the `./scripts/` di ``` # Run Functional Tests -./scripts/functional_tests/driver.sh ./build/tests/functional_tests/rocshmem_example_driver all +./scripts/functional_tests/driver.sh ./build/tests/functional_tests/rocshmem_functional_tests all # Run Unit Tests ./scripts/unit_tests/driver.sh ./build/tests/unit_tests/rocshmem_unit_tests all diff --git a/projects/rocshmem/scripts/build_configs/codecov b/projects/rocshmem/scripts/build_configs/codecov index 4ab02c0e48..aec025dc82 100755 --- a/projects/rocshmem/scripts/build_configs/codecov +++ b/projects/rocshmem/scripts/build_configs/codecov @@ -36,29 +36,33 @@ LLVM_PROFILE_FILE="$PROFRAW_DIR/allreduce_test-%m.profraw" mpirun -np 4 ./ipc/e # Functional Tests -LLVM_PROFILE_FILE="$PROFRAW_DIR/ipc-functional-%p.profraw" ../scripts/functional_tests/driver.sh ./ipc/tests/functional_tests/rocshmem_example_driver all ./test_output/ -LLVM_PROFILE_FILE="$PROFRAW_DIR/ro_net-functional-%p.profraw" ../scripts/functional_tests/driver.sh ./ro_net/tests/functional_tests/rocshmem_example_driver all ./test_output/ -LLVM_PROFILE_FILE="$PROFRAW_DIR/ro_ipc-functional-%p.profraw" ../scripts/functional_tests/driver.sh ./ro_ipc/tests/functional_tests/rocshmem_example_driver all ./test_output/ +LLVM_PROFILE_FILE="$PROFRAW_DIR/ipc-functional-%p.profraw" ../scripts/functional_tests/driver.sh ./ipc/tests/functional_tests/rocshmem_functional_tests all ./test_output/ +LLVM_PROFILE_FILE="$PROFRAW_DIR/ro_net-functional-%p.profraw" ../scripts/functional_tests/driver.sh ./ro_net/tests/functional_tests/rocshmem_functional_tests all ./test_output/ +LLVM_PROFILE_FILE="$PROFRAW_DIR/ro_ipc-functional-%p.profraw" ../scripts/functional_tests/driver.sh ./ro_ipc/tests/functional_tests/rocshmem_functional_tests all ./test_output/ # Coverage Report /opt/rocm/llvm/bin/llvm-profdata merge -sparse $PROFRAW_DIR/*.profraw -o ./coverage-report/rocshmem.profdata /opt/rocm/llvm/bin/llvm-cov report \ -object ./ipc/tests/unit_tests/rocshmem_unit_tests \ - -object ./ipc/tests/functional_tests/rocshmem_example_driver \ + -object ./ipc/tests/functional_tests/rocshmem_functional_tests \ + -object ./ipc/examples/rocshmem_init_attr_test \ + -object ./ipc/examples/rocshmem_allreduce_test \ -object ./ro_net/tests/unit_tests/rocshmem_unit_tests \ - -object ./ro_net/tests/functional_tests/rocshmem_example_driver \ + -object ./ro_net/tests/functional_tests/rocshmem_functional_tests \ -object ./ro_ipc/tests/unit_tests/rocshmem_unit_tests \ - -object ./ro_ipc/tests/functional_tests/rocshmem_example_driver \ + -object ./ro_ipc/tests/functional_tests/rocshmem_functional_tests \ -instr-profile=./coverage-report/rocshmem.profdata \ --ignore-filename-regex=".*test.*" /opt/rocm/llvm/bin/llvm-cov show \ -object ./ipc/tests/unit_tests/rocshmem_unit_tests \ - -object ./ipc/tests/functional_tests/rocshmem_example_driver \ + -object ./ipc/tests/functional_tests/rocshmem_functional_tests \ + -object ./ipc/examples/rocshmem_init_attr_test \ + -object ./ipc/examples/rocshmem_allreduce_test \ -object ./ro_net/tests/unit_tests/rocshmem_unit_tests \ - -object ./ro_net/tests/functional_tests/rocshmem_example_driver \ + -object ./ro_net/tests/functional_tests/rocshmem_functional_tests \ -object ./ro_ipc/tests/unit_tests/rocshmem_unit_tests \ - -object ./ro_ipc/tests/functional_tests/rocshmem_example_driver \ + -object ./ro_ipc/tests/functional_tests/rocshmem_functional_tests \ -instr-profile=./coverage-report/rocshmem.profdata \ --ignore-filename-regex=".*test.*" \ -format=html \ diff --git a/projects/rocshmem/scripts/functional_tests/driver.py b/projects/rocshmem/scripts/functional_tests/driver.py index b6ed1f6d6b..95ae4fe5de 100755 --- a/projects/rocshmem/scripts/functional_tests/driver.py +++ b/projects/rocshmem/scripts/functional_tests/driver.py @@ -118,7 +118,7 @@ def parse_command_line(): parser.add_argument('--client_binary_path', dest='client_binary_path', type=str, - default=os.getcwd()+'/build/rocshmem_example_driver') + default=os.getcwd()+'/build/rocshmem_functional_tests') parser.add_argument('--output_directory_path', dest='output_directory_path', diff --git a/projects/rocshmem/scripts/functional_tests/gdbrun b/projects/rocshmem/scripts/functional_tests/gdbrun index 5272eb36ac..d105702536 100755 --- a/projects/rocshmem/scripts/functional_tests/gdbrun +++ b/projects/rocshmem/scripts/functional_tests/gdbrun @@ -29,6 +29,6 @@ set -e for i in {1..$2}; do - mpirun -np 2 xterm -e gdb -x gdbscript --args build/rocshmem_example_driver -t 1 -w 1 -s 32768 -a $1 -x 8 + mpirun -np 2 xterm -e gdb -x gdbscript --args build/rocshmem_functional_tests -t 1 -w 1 -s 32768 -a $1 -x 8 test $? -eq 0 || exit 1 done diff --git a/projects/rocshmem/scripts/functional_tests/shmem_allLib_build_and_test.sh b/projects/rocshmem/scripts/functional_tests/shmem_allLib_build_and_test.sh index dcc564928d..7f54a946c4 100755 --- a/projects/rocshmem/scripts/functional_tests/shmem_allLib_build_and_test.sh +++ b/projects/rocshmem/scripts/functional_tests/shmem_allLib_build_and_test.sh @@ -25,7 +25,7 @@ #!/bin/bash ############################################### # Script : shmem_allLib_build_and_test.sh -# Description : the script is to build and execute test for +# Description : the script is to build and execute test for # given libraries as parameter to the script. # the script used in math_ci jenkins pipeline # version 1.0 (Version 1) @@ -91,12 +91,12 @@ do esac if [ "$libnm" != "" ] #process only if libname found - then + then echo "+-------------------------------------------------------------------------------------------------+" echo `date +%Y%m%d%H%M%S`" ==> Start | $threadType - build_configs/$libnm <==" echo "starting with params==> $libnm ; $libBuildDir ; $threadType" echo - + echo "Library build at ==> "$libBuildDir mkdir $libBuildDir @@ -110,9 +110,9 @@ do ROC_NET_CPU_QUEUE=1 UCX_TLS=rc #echo $ROCSHMEM_RO"--"$ROC_NET_CPU_QUEUE "--"$UCX_TLS - ../scripts/functional_tests/driver.sh tests/functional_tests/rocshmem_example_driver $threadType . + ../scripts/functional_tests/driver.sh tests/functional_tests/rocshmem_functional_tests $threadType . else - ../scripts/functional_tests/driver.sh tests/functional_tests/rocshmem_example_driver $threadType . + ../scripts/functional_tests/driver.sh tests/functional_tests/rocshmem_functional_tests $threadType . fi if [ $? -ne 0 ] @@ -133,7 +133,7 @@ do libBuildDir="" threadType="" done -echo +echo echo "Script execution ==> $0 <== is done" -echo +echo