From 83188f5462d3da157d37b169328c0caf68884a0c Mon Sep 17 00:00:00 2001
From: Philip Salzmann <philip.salzmann@uibk.ac.at>
Date: Thu, 12 Dec 2024 16:31:16 +0100
Subject: [PATCH] Rename hipSYCL to AdaptiveCpp, update CI version and filters

---
 .github/workflows/cts_ci.yml                  |  4 +--
 ci/{hipsycl.filter => adaptivecpp.filter}     | 32 +++++++++++++++++--
 ...pthipSYCL.cmake => AdaptAdaptiveCpp.cmake} |  2 +-
 docker/{hipsycl => adaptivecpp}/Dockerfile    | 11 +++++--
 docker/{hipsycl => adaptivecpp}/configure.sh  |  0
 5 files changed, 42 insertions(+), 7 deletions(-)
 rename ci/{hipsycl.filter => adaptivecpp.filter} (59%)
 rename cmake/{AdapthipSYCL.cmake => AdaptAdaptiveCpp.cmake} (95%)
 rename docker/{hipsycl => adaptivecpp}/Dockerfile (68%)
 rename docker/{hipsycl => adaptivecpp}/configure.sh (100%)

diff --git a/.github/workflows/cts_ci.yml b/.github/workflows/cts_ci.yml
index 5a825539d..642b3d6b3 100644
--- a/.github/workflows/cts_ci.yml
+++ b/.github/workflows/cts_ci.yml
@@ -58,7 +58,7 @@ jobs:
           - sycl-impl: dpcpp
             version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb
           - sycl-impl: adaptivecpp
-            version: 3d8b1cd
+            version: 061e2d6ffe1084021d99f22ac1f16e28c6dab899
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -116,7 +116,7 @@ jobs:
           - sycl-impl: dpcpp
             version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb
           - sycl-impl: adaptivecpp
-            version: 3d8b1cd
+            version: 061e2d6ffe1084021d99f22ac1f16e28c6dab899
     env:
       container-workspace: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
       parallel-build-jobs: 2
diff --git a/ci/hipsycl.filter b/ci/adaptivecpp.filter
similarity index 59%
rename from ci/hipsycl.filter
rename to ci/adaptivecpp.filter
index d4f9719d0..3f61c128e 100644
--- a/ci/hipsycl.filter
+++ b/ci/adaptivecpp.filter
@@ -1,44 +1,72 @@
+accessor_basic
+accessor_generic
 accessor_legacy
+accessor_placeholder
+address_space
 atomic
+atomic_fence
+atomic_ref
+atomic_ref_stress
+bit_cast
 buffer
 context
 device
+device_event
 device_selector
+error
 event
 exception_handling
 exceptions
+full_feature_set
 group
+group_functions
 h_item
 handler
+header
 hierarchical
+host_accessor
 host_task
+id
 image
 image_accessor
+invoke
+is_device_copyable
 item
 kernel
 kernel_args
 kernel_bundle
+language
+local_accessor
+marray_arithmetic_assignment
+marray_arithmetic_binary
 marray_basic
 marray_bitwise
 marray_pre_post
 marray_relational
-marray_arithmetic_assignment
-marray_arithmetic_binary
 math_builtin_api
 multi_ptr
+namespace
 nd_item
 nd_range
+opencl_interop
+optional_kernel_features
+platform
+pointers
 property
 queue
 range
+reduction
 sampler
 scalars
 spec_constants
 stream
+sub_group
+sycl_external
 usm
 vector_alias
 vector_api
 vector_constructors
+vector_deduction_guides
 vector_load_store
 vector_operators
 vector_swizzle_assignment
diff --git a/cmake/AdapthipSYCL.cmake b/cmake/AdaptAdaptiveCpp.cmake
similarity index 95%
rename from cmake/AdapthipSYCL.cmake
rename to cmake/AdaptAdaptiveCpp.cmake
index 3b001540d..62a51cc2d 100644
--- a/cmake/AdapthipSYCL.cmake
+++ b/cmake/AdaptAdaptiveCpp.cmake
@@ -1,5 +1,5 @@
 add_library(SYCL::SYCL INTERFACE IMPORTED GLOBAL)
-target_link_libraries(SYCL::SYCL INTERFACE AdaptiveCpp::AdaptiveCpp-rt)
+target_link_libraries(SYCL::SYCL INTERFACE AdaptiveCpp::acpp-rt)
 # add_sycl_executable_implementation function
 # Builds a SYCL program, compiling multiple SYCL test case source files into a
 # test executable, invoking a single-source/device compiler
diff --git a/docker/hipsycl/Dockerfile b/docker/adaptivecpp/Dockerfile
similarity index 68%
rename from docker/hipsycl/Dockerfile
rename to docker/adaptivecpp/Dockerfile
index a363914e8..550c091be 100644
--- a/docker/hipsycl/Dockerfile
+++ b/docker/adaptivecpp/Dockerfile
@@ -14,12 +14,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
 
-RUN git clone https://github.com/illuhad/AdaptiveCpp.git \
-      --branch=develop --single-branch --shallow-since=2021-08-01 \
+RUN git clone https://github.com/AdaptiveCpp/AdaptiveCpp.git \
+      --branch=develop --single-branch --shallow-since=2024-12-01 \
       --recurse-submodules /tmp/AdaptiveCpp && \
     cd /tmp/AdaptiveCpp && \
     git checkout $IMPL_VERSION && \
     cmake /tmp/AdaptiveCpp -G Ninja -B /tmp/build \
+      -DWITH_SSCP_COMPILER=OFF \
+      -DWITH_STDPAR_COMPILER=OFF \
+      -DWITH_ACCELERATED_CPU=OFF \
+      -DWITH_CUDA_BACKEND=OFF \
+      -DWITH_ROCM_BACKEND=OFF \
+      -DWITH_OPENCL_BACKEND=OFF \
+      -DWITH_CPU_BACKEND=ON \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX=/sycl && \
     cmake --build /tmp/build --target install && \
diff --git a/docker/hipsycl/configure.sh b/docker/adaptivecpp/configure.sh
similarity index 100%
rename from docker/hipsycl/configure.sh
rename to docker/adaptivecpp/configure.sh