From 362da9a9f1f3b5e9e0b0bbac64ba3b1fde3ca2d9 Mon Sep 17 00:00:00 2001 From: Jatin Chaudhary <51944368+cjatin@users.noreply.github.com> Date: Tue, 4 Jul 2023 06:19:19 +0100 Subject: [PATCH] SWDEV-408621 - Fix windows CI breakage (#343) Change-Id: I8e7f8b614cee917214c3eec0023fe1c4c68d991a [ROCm/hip-tests commit: fe9515a99a58ae38bcfb87b3a4f94123c3c21ff5] --- .../hip-tests/catch/unit/graph/CMakeLists.txt | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/projects/hip-tests/catch/unit/graph/CMakeLists.txt b/projects/hip-tests/catch/unit/graph/CMakeLists.txt index 88a4fba56b..034063060f 100644 --- a/projects/hip-tests/catch/unit/graph/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/graph/CMakeLists.txt @@ -18,7 +18,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -# Common Tests - Test independent of all platforms +# FIXME: cjatin +# This is a temp hack to pass it on windows since it has a char limit for +# command line. Eventually we need to use rsp files with ninja on windows. +# But this exposes several problems with hipcc and build system on windows. +# While those are fixed, this hack should allow us to pass windows CI. set(TEST_SRC hipGraphAddEmptyNode.cc hipGraphAddDependencies.cc @@ -65,7 +69,20 @@ set(TEST_SRC hipStreamBeginCapture.cc hipStreamBeginCapture_old.cc hipStreamIsCapturing.cc - hipStreamIsCapturing_old.cc + hipStreamIsCapturing_old.cc) + +if(HIP_PLATFORM MATCHES "amd") + set(AMD_SRC + hipStreamCaptureExtModuleLaunchKernel.cc + ) + set(TEST_SRC ${TEST_SRC} ${AMD_SRC}) +endif() + +hip_add_exe_to_target(NAME GraphsTest1 + TEST_SRC ${TEST_SRC} + TEST_TARGET_NAME build_tests) + +set(TEST_SRC hipStreamGetCaptureInfo.cc hipStreamGetCaptureInfo_old.cc hipStreamEndCapture.cc @@ -111,17 +128,9 @@ set(TEST_SRC hipGraphKernelNodeCopyAttributes.cc hipGraphCycle.cc hipGraphKernelNodeGetAttribute.cc - hipGraphKernelNodeSetAttribute.cc -) + hipGraphKernelNodeSetAttribute.cc) -if(HIP_PLATFORM MATCHES "amd") - set(AMD_SRC - hipStreamCaptureExtModuleLaunchKernel.cc - ) - set(TEST_SRC ${TEST_SRC} ${AMD_SRC}) -endif() - -hip_add_exe_to_target(NAME GraphsTest +hip_add_exe_to_target(NAME GraphsTest2 TEST_SRC ${TEST_SRC} TEST_TARGET_NAME build_tests)