From b490aec8e656b8ea81edf6763952e799f0adb60d Mon Sep 17 00:00:00 2001 From: Apurv Mishra Date: Wed, 26 Mar 2025 16:08:40 -0400 Subject: [PATCH] kfdtest: support for upstream kernel driver detect if the loaded driver is upstream or DKMS version and add a filter for for the tests that fail in upstream driver Signed-off-by: Apurv Mishra [ROCm/ROCR-Runtime commit: 10530fa2a73c5b704ee875deb09d5492aae3e100] --- .../libhsakmt/tests/kfdtest/scripts/kfdtest.exclude | 4 +++- .../libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/kfdtest.exclude b/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/kfdtest.exclude index 534c8ed298..ff01b87c3a 100644 --- a/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/kfdtest.exclude +++ b/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/kfdtest.exclude @@ -379,6 +379,8 @@ FILTER[RHEL9]=\ "$BLACKLIST_ALL_ASICS:"\ "$BLACKLIST_GFX11:"\ "KFDQMTest.ExtendedCuMasking:"\ -"KFDIPCTest.*:"\ "KFDEvictTest.QueueTest:"\ "KFDPCSamplingTest.*" + +FILTER[upstream]=\ +"KFDIPCTest.*" diff --git a/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh b/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh index 3d2b627d1e..037c24fb0f 100755 --- a/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh +++ b/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh @@ -128,6 +128,13 @@ getFilter() { gtestFilter="--gtest_filter=${FILTER[$platform]}" ;; esac + + # Check if the loaded driver is upstream (in-box) or DKMS + rdma_get_pages_func=$(cat /proc/kallsyms | grep rdma_get_pages) + if [ -z "$rdma_get_pages_func" ]; then + gtestFilter="$gtestFilter:${FILTER[upstream]}" + fi + if [ -n "$ADDITIONAL_EXCLUDE" ]; then gtestFilter="$gtestFilter:$ADDITIONAL_EXCLUDE" fi