From 612fbfcf0bbfce76b165d9f5a03d985529305351 Mon Sep 17 00:00:00 2001 From: Sebastian Luzynski Date: Thu, 11 Apr 2024 11:21:18 +0000 Subject: [PATCH] SWDEV-452864 - disable Unit_hiprtc_stdheaders test Signed-off-by: Sebastian Luzynski Change-Id: Iee312683dcd83104f330214d4246bef08517000f --- catch/hipTestMain/config/config_amd_linux | 2 -- catch/hipTestMain/config/config_amd_windows | 2 -- catch/unit/rtc/stdheaders.cc | 34 +++++++++++++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux index f632877f14..1a49eda076 100644 --- a/catch/hipTestMain/config/config_amd_linux +++ b/catch/hipTestMain/config/config_amd_linux @@ -125,8 +125,6 @@ "Unit_Device___uhadd_Sanity_Positive", "Unit_Device___rhadd_Sanity_Positive", "Unit_Device___urhadd_Sanity_Positive", - "=== Patch which removes the typetraits implementation from std namespace in hiprtc is reverted ===", - "Unit_hiprtc_stdheaders", "Unit_hipGraphAddMemcpyNode_Negative_Parameters", "=== Below 2 tests are disable due to defect EXSWHTEC-369 ===", "Unit_Device_ilogbf_Accuracy_Positive", diff --git a/catch/hipTestMain/config/config_amd_windows b/catch/hipTestMain/config/config_amd_windows index cc380dd0fd..83a4f80ab1 100644 --- a/catch/hipTestMain/config/config_amd_windows +++ b/catch/hipTestMain/config/config_amd_windows @@ -218,8 +218,6 @@ "Unit_Layered2DTexture_Check_DeviceBufferToFromLayered2DArray - float4", "=== Below test is disabled due to defect EXSWHTEC-347 ===", "Unit_hipPointerSetAttribute_Positive_SyncMemops", - "=== Patch which removes the typetraits implementation from std namespace in hiprtc is reverted ===", - "Unit_hiprtc_stdheaders", "NOTE: The following test is disabled due to defect - EXSWHTEC-241", "Unit_hipFuncGetAttributes_Negative_Parameters", "NOTE: The following test is disabled due to defect - EXSWHTEC-242", diff --git a/catch/unit/rtc/stdheaders.cc b/catch/unit/rtc/stdheaders.cc index cb52c2ae82..e9946358c4 100644 --- a/catch/unit/rtc/stdheaders.cc +++ b/catch/unit/rtc/stdheaders.cc @@ -20,9 +20,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -// This test verifies hiprtc compilation when the C++ std headers such as type_traits, -// iterator etc. are included in the program. HIPRTC also defines few std templates -// and this should not cause conflicts with std headers. +/** + * @addtogroup hiprtc_std_headers hiprtc_std_headers + * @{ + * @ingroup hiprtcHeadersTest + * `hiprtcResult hiprtcCompileProgram(hiprtcProgram prog, + * int numOptions, + * const char** options);` - + * This test verifies hiprtc compilation when the C++ std headers such as type_traits, + * iterator etc. are included in the program. HIPRTC also defines few std templates + * and this should not cause conflicts with std headers. + */ #include #include @@ -56,7 +64,22 @@ template __global__ void stdheader(T a, bool* passed) { #endif )"}; +/** + * Test Description + * ------------------------ + * - Executes `hiprtcCompileProgram` with additional C++ std + * headers used in kernel source + * Test source + * ------------------------ + * - unit/rtc/stdheaders.cc + * Test requirements + * ------------------------ + * - ROCM_VERSION >= 7.0 + */ TEST_CASE("Unit_hiprtc_stdheaders") { + HipTest::HIP_SKIP_TEST("Test disabled due to incorrect ROCm version"); + return; + using namespace std; hiprtcProgram prog; HIPRTC_CHECK(hiprtcCreateProgram(&prog, source, "stdheader.cu", 0, nullptr, nullptr)); @@ -118,3 +141,8 @@ TEST_CASE("Unit_hiprtc_stdheaders") { HIPRTC_CHECK(hiprtcDestroyProgram(&prog)); REQUIRE(*hResult == true); } + +/** + * End doxygen group hiprtc_std_headers. + * @} + */