Skip to content

Pass ENVIRONMENT_MODIFICATION to hip-kernel-provider test registration #12804

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

Merged
CMiservaAMD merged 1 commit into from
Oct 7, 2026
Merged

Pass ENVIRONMENT_MODIFICATION to hip-kernel-provider test registration #12804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 1 deletion dnn-providers/hip-kernel-provider/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ if(HIPKERNELPROVIDER_ENABLE_TESTS)
"${PROJECT_BINARY_DIR}/staging"
"${HIPKERNELPROVIDER_CTEST_INSTALL_FILE}"
ENVIRONMENT ${hip_kernel_provider_tests_TEST_ENVIRONMENT}
ENVIRONMENT_MODIFICATION ${TEST_ENVIRONMENT_MODIFICATION}
)
# hip_kernel_provider_integration_tests_TEST_ENVIRONMENT is TEST_ENVIRONMENT
# merged with any per-target ENVIRONMENT passed to add_integration_test_target(),
Expand All @@ -221,6 +222,7 @@ if(HIPKERNELPROVIDER_ENABLE_TESTS)
"${PROJECT_BINARY_DIR}/staging"
"${HIPKERNELPROVIDER_CTEST_INSTALL_FILE}"
ENVIRONMENT ${hip_kernel_provider_integration_tests_TEST_ENVIRONMENT}
ENVIRONMENT_MODIFICATION ${TEST_ENVIRONMENT_MODIFICATION}
)
endif()

Expand All @@ -231,6 +233,7 @@ if(HIPKERNELPROVIDER_ENABLE_TESTS)
INSTALL_TEST_FILE "${HIPKERNELPROVIDER_CTEST_INSTALL_FILE}"
TEST_NAME_PREFIX ${PROJECT_NAME}-external-integration
ENVIRONMENT ${TEST_ENVIRONMENT}
ENVIRONMENT_MODIFICATION ${TEST_ENVIRONMENT_MODIFICATION}
)
endif()

Expand Down Expand Up @@ -300,6 +303,7 @@ if(HIPKERNELPROVIDER_ENABLE_TESTS)
INSTALL_TEST_FILE "${HIPKERNELPROVIDER_CTEST_INSTALL_FILE}"
TEST_NAME_PREFIX ${PROJECT_NAME}-asm-sdpa-external-integration
ENVIRONMENT ${TEST_ENVIRONMENT}
ENVIRONMENT_MODIFICATION ${TEST_ENVIRONMENT_MODIFICATION}
)
endif()

Expand Down Expand Up @@ -382,7 +386,7 @@ if(HIPKERNELPROVIDER_ENABLE_TESTS)
INSTALL_DESTINATION "${_hkp_gfx950_shard_dest}"
INSTALL_STAGING_KEY hkp_census_gfx950)

# GTEST_FILTER and ENVIRONMENT belong here rather than in
# GTEST_FILTER, ENVIRONMENT and ENVIRONMENT_MODIFICATION belong here rather than in
# _gfx950_attention_dense_category_args: that list is populated only under YAML
# categorization, so anything folded into it is absent from a legacy-label build,
# which then enumerates the whole bundle tree pinned to this engine and runs
Expand All @@ -397,6 +401,7 @@ if(HIPKERNELPROVIDER_ENABLE_TESTS)
TEST_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/../config/hipkernel_Gfx950AttentionDense.toml
GTEST_FILTER "quick_SdpaFwd_bshd_*:standard_SdpaFwd_bshd_*"
ENVIRONMENT ${TEST_ENVIRONMENT}
ENVIRONMENT_MODIFICATION ${TEST_ENVIRONMENT_MODIFICATION}
${_gfx950_attention_dense_category_args}
)
message(STATUS "Created ${PROJECT_NAME}-gfx950-attention-dense-external-integration-check target")
Expand Down
3 changes: 3 additions & 0 deletions dnn-providers/hip-kernel-provider/src/integration_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ if(HIPDNN_ENABLE_KERNEL_INGESTOR AND HIPDNN_ENABLE_SDPA
${_gfx950_shard_args}
REFERENCE_EXECUTOR gpu
GTEST_FILTER "quick_SdpaFwd_bshd_*:standard_SdpaFwd_bshd_*"
ENVIRONMENT_MODIFICATION ${TEST_ENVIRONMENT_MODIFICATION}
)
endif()

Expand All @@ -224,5 +225,7 @@ if(ENABLE_ASM_SDPA_ENGINE AND HIPDNN_ENABLE_SDPA
REFERENCE_EXECUTOR gpu
GTEST_FILTER
Smoke/IntegrationGpuSdpaFwdBfp16.Correctness/*
ENVIRONMENT_MODIFICATION
${TEST_ENVIRONMENT_MODIFICATION}
)
endif()
Loading