From 9afc474561c7b8d3e2580608559b7f017a051779 Mon Sep 17 00:00:00 2001
From: Fraser Cormack <fraser@codeplay.com>
Date: Thu, 13 Jun 2024 08:05:29 +0100
Subject: [PATCH] tmp

---
 .github/workflows/build-hw-reusable.yml            | 5 +----
 test/conformance/enqueue/enqueue_adapter_hip.match | 5 +----
 test/conformance/enqueue/urEnqueueKernelLaunch.cpp | 2 +-
 test/conformance/testing/include/uur/fixtures.h    | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-hw-reusable.yml b/.github/workflows/build-hw-reusable.yml
index 3edc9b2009..8c8f28a868 100644
--- a/.github/workflows/build-hw-reusable.yml
+++ b/.github/workflows/build-hw-reusable.yml
@@ -21,7 +21,6 @@ env:
   UR_LOG_LEVEL_ZERO: "level:error;flush:error"
   UR_LOG_NATIVE_CPU: "level:error;flush:error"
   UR_LOG_OPENCL: "level:error;flush:error"
-  AMD_LOG_LEVEL: "4"
 
 jobs:
   adapter-build-hw:
@@ -79,9 +78,7 @@ jobs:
 
     - name: Test adapters
       working-directory: ${{github.workspace}}/build
-      run: |
-        ./bin/test-usm
-        env UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --output-on-failure -L "conformance" --timeout 180
+      run: env UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --output-on-failure -L "conformance" --timeout 180
 
     - name: Get information about platform
       if: ${{ always() }}
diff --git a/test/conformance/enqueue/enqueue_adapter_hip.match b/test/conformance/enqueue/enqueue_adapter_hip.match
index 23b2edee85..7df8b1b2c9 100644
--- a/test/conformance/enqueue/enqueue_adapter_hip.match
+++ b/test/conformance/enqueue/enqueue_adapter_hip.match
@@ -2,10 +2,7 @@
 urEnqueueKernelLaunchTest.InvalidKernelArgs/AMD_HIP_BACKEND___{{.*}}_
 urEnqueueKernelLaunchKernelWgSizeTest.NonMatchingLocalSize/AMD_HIP_BACKEND___{{.*}}_
 urEnqueueKernelLaunchKernelSubGroupTest.Success/AMD_HIP_BACKEND___{{.*}}_
-
-# This passes on HIP 6.0+ but fails (unsupported) before then
-{{OPT}}urEnqueueKernelLaunchUSMLinkedList.Success/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled
-
+urEnqueueKernelLaunchUSMLinkedList.Success/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled
 {{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___copy_row_2D
 {{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___copy_3d_2d
 urEnqueueMemBufferFillTest.Success/AMD_HIP_BACKEND___{{.*}}___size__256__patternSize__256
diff --git a/test/conformance/enqueue/urEnqueueKernelLaunch.cpp b/test/conformance/enqueue/urEnqueueKernelLaunch.cpp
index 79c8ac14da..3f9d6cb996 100644
--- a/test/conformance/enqueue/urEnqueueKernelLaunch.cpp
+++ b/test/conformance/enqueue/urEnqueueKernelLaunch.cpp
@@ -480,7 +480,7 @@ struct urEnqueueKernelLaunchUSMLinkedList
     const int num_nodes = 4;
     bool use_pool = false;
     ur_usm_pool_handle_t pool = nullptr;
-    ur_queue_handle_t queue;
+    ur_queue_handle_t queue = nullptr;
 };
 
 UUR_TEST_SUITE_P(
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
index 0960343403..bcdc94d524 100644
--- a/test/conformance/testing/include/uur/fixtures.h
+++ b/test/conformance/testing/include/uur/fixtures.h
@@ -406,7 +406,7 @@ template <class T> struct urQueueTestWithParam : urContextTestWithParam<T> {
     }
     ur_queue_properties_t queue_properties = {
         UR_STRUCTURE_TYPE_QUEUE_PROPERTIES, nullptr, 0};
-    ur_queue_handle_t queue;
+    ur_queue_handle_t queue = nullptr;
 };
 
 template <class T>