Update documentation for AdaptiveCpp

YUZHIGUIYI · Oct 31, 2023 · d486fff · d486fff
1 parent d0d1bb5
commit d486fff
Show file tree

Hide file tree

Showing 23 changed files with 76 additions and 65 deletions.
diff --git a/Code_Exercises/Exercise_01_Compiling_with_SYCL/README.md b/Code_Exercises/Exercise_01_Compiling_with_SYCL/README.md
@@ -19,7 +19,7 @@ Depending on the SYCL implementation used, the steps to verify your environment
 
 #### When using AdaptiveCpp
 
-With AdaptiveCpp, you can skip this step. If you suspect later that your environment might not be set up correctly, you can set the environment variable `ADAPTIVECPP_DEBUG_LEVEL=3` and execute your program. hipSYCL will then print (among many other things) all devices that it can find, for example:
+With AdaptiveCpp, you can skip this step. If you suspect later that your environment might not be set up correctly, you can set the environment variable `ACPP_DEBUG_LEVEL=3` and execute your program. AdaptiveCpp will then print (among many other things) all devices that it can find, for example:
 ```sh
 [AdaptiveCpp Info] Discovered devices from backend 'OpenMP': 
 [AdaptiveCpp Info]   device 0: 
@@ -86,15 +86,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/AdaptiveCpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/AdaptiveCpp -DACPP_TARGETS="<target specification>" ..
 make exercise_1
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_01_compiling_with_SYCL
-/path/to/AdaptiveCpp/bin/syclcc -o sycl-ex-1 -I../../External/Catch2/single_include --hipsycl-targets="<target specification>" source.cpp
+/path/to/AdaptiveCpp/bin/acpp -o sycl-ex-1 -I../../External/Catch2/single_include --hipsycl-targets="<target specification>" source.cpp
 ./sycl-ex-1
 ```
 

diff --git a/Code_Exercises/Exercise_02_Hello_World/README.md b/Code_Exercises/Exercise_02_Hello_World/README.md
@@ -78,16 +78,16 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
 cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_ENABLE_SOLUTIONS=OFF
--DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+-DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_2
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_02_Hello_World
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-2 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-2 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-2
 ```
 

diff --git a/Code_Exercises/Exercise_03_Scalar_Add/README.md b/Code_Exercises/Exercise_03_Scalar_Add/README.md
@@ -71,15 +71,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adapivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adapivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_3
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_03_Scalar_Add
-/path/to/AdaptiveCpp/bin/syclcc -o sycl-ex-3 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/AdaptiveCpp/bin/acpp -o sycl-ex-3 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-3
 ```
 

diff --git a/Code_Exercises/Exercise_04_Handling_Errors/README.md b/Code_Exercises/Exercise_04_Handling_Errors/README.md
@@ -55,15 +55,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/AdaptiveCpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/AdaptiveCpp -DACPP_TARGETS="<target specification>" ..
 make exercise_4
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_04_Handling_Errors
-/path/to/AdaptiveCpp/bin/syclcc -o sycl-ex-4 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/AdaptiveCpp/bin/acpp -o sycl-ex-4 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-4
 ```
 

diff --git a/Code_Exercises/Exercise_04_Handling_Errors/source.cpp b/Code_Exercises/Exercise_04_Handling_Errors/source.cpp
@@ -11,6 +11,8 @@
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 
+#include <sycl/sycl.hpp>
+
 TEST_CASE("handling_errors", "handling_errors_source") {
 
   // Task: catch synchronous and asynchronous exceptions

diff --git a/Code_Exercises/Exercise_05_Device_Selection/README.md b/Code_Exercises/Exercise_05_Device_Selection/README.md
@@ -77,15 +77,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_5
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_05_Device_Selection
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-5 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-5 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-5
 ```
 

diff --git a/Code_Exercises/Exercise_05_Device_Selection/source.cpp b/Code_Exercises/Exercise_05_Device_Selection/source.cpp
@@ -48,9 +48,14 @@
  *
 */
 
+
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 
+#include <sycl/sycl.hpp>
+
+class scalar_add;
+
 TEST_CASE("intel_gpu_device_selector", "device_selectors_solution") {
   int a = 18, b = 24, r = 0;
 

diff --git a/Code_Exercises/Exercise_06_Vector_Add/README.md b/Code_Exercises/Exercise_06_Vector_Add/README.md
@@ -62,15 +62,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_6
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_06_Vector_Add
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-6 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-6 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-6
 ```
 

diff --git a/Code_Exercises/Exercise_07_USM_Selector/README.md b/Code_Exercises/Exercise_07_USM_Selector/README.md
@@ -51,15 +51,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_7 
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_07_USM_Selector
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-7 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-7 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-7
 ```
 

diff --git a/Code_Exercises/Exercise_07_USM_Selector/source.cpp b/Code_Exercises/Exercise_07_USM_Selector/source.cpp
@@ -11,6 +11,8 @@
 #define CATCH_CONFIG_MAIN
 #include <catch2/catch.hpp>
 
+#include <sycl/sycl.hpp>
+
 TEST_CASE("usm_selector", "usm_selector_source") {
 
   // Task: create a queue to a device which supports USM allocations

diff --git a/Code_Exercises/Exercise_08_USM_Vector_Add/README.md b/Code_Exercises/Exercise_08_USM_Vector_Add/README.md
@@ -93,15 +93,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_8
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_08_USM_Vector_Add
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-8 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-8 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-8
 ```
 

diff --git a/Code_Exercises/Exercise_09_Synchronization/README.md b/Code_Exercises/Exercise_09_Synchronization/README.md
@@ -74,15 +74,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_9
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_09_Synchronization
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-9 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-9 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-9
 ```
 

diff --git a/Code_Exercises/Exercise_10_Managing_Dependencies/README.md b/Code_Exercises/Exercise_10_Managing_Dependencies/README.md
@@ -65,15 +65,15 @@ qsub job_submission
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_10 
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_10_Managing_Dependencies
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-10 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-10 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-10
 ```
 

diff --git a/Code_Exercises/Exercise_11_In_Order_Queue/README.md b/Code_Exercises/Exercise_11_In_Order_Queue/README.md
@@ -48,14 +48,14 @@ icpx -fsycl -o sycl-ex-11 -I../External/Catch2/single_include ../Code_Exercises/
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_11
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_11_In_Order_Queue
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-11 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-11 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-11
 ```
diff --git a/Code_Exercises/Exercise_12_Temporary_Data/README.md b/Code_Exercises/Exercise_12_Temporary_Data/README.md
@@ -55,14 +55,14 @@ icpx -fsycl -o sycl-ex-12 -I../External/Catch2/single_include ../Code_Exercises/
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_12
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_12_Temporary_Data
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-12 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-12 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-12
 ```
diff --git a/Code_Exercises/Exercise_13_Load_Balancing/README.md b/Code_Exercises/Exercise_13_Load_Balancing/README.md
@@ -56,14 +56,14 @@ icpx -fsycl -o sycl-ex-13 -I../External/Catch2/single_include ../Code_Exercises/
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_13
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_13_Load_Balancing
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-13 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-13 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-13
 ```
diff --git a/Code_Exercises/Exercise_14_ND_Range_Kernel/README.md b/Code_Exercises/Exercise_14_ND_Range_Kernel/README.md
@@ -58,14 +58,14 @@ icpx -fsycl -o sycl-ex-14 -I../External/Catch2/single_include ../Code_Exercises/
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_14
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_14_ND_Range_Kernel
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-14 -I../../External/Catch2/single_include --adaptivecpp-targets="<target specification>" source.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-14 -I../../External/Catch2/single_include --acpp-targets="<target specification>" source.cpp
 ./sycl-ex-14
 ```
diff --git a/Code_Exercises/Exercise_15_Image_Convolution/README.md b/Code_Exercises/Exercise_15_Image_Convolution/README.md
@@ -69,13 +69,13 @@ icpx -fsycl -o sycl-ex-15 -I../../Utilities/include/ -I../../External/stb refere
 For AdaptiveCpp:
 ```sh
 # <target specification> is a list of backends and devices to target, for example
-# "omp;hip:gfx900,gfx906" compiles for CPUs with the OpenMP backend and for AMD Vega 10 (gfx900) and Vega 20 (gfx906) GPUs using the HIP backend.
+# "omp;generic" compiles for CPUs with the OpenMP backend and GPUs using the generic single-pass compiler.
 # The simplest target specification is "omp" which compiles for CPUs using the OpenMP backend.
-cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DADAPTIVECPP_TARGETS="<target specification>" ..
+cmake -DSYCL_ACADEMY_USE_ADAPTIVECPP=ON -DSYCL_ACADEMY_INSTALL_ROOT=/insert/path/to/adaptivecpp -DACPP_TARGETS="<target specification>" ..
 make exercise_15
 ```
 alternatively, without CMake:
 ```sh
 cd Code_Exercises/Exercise_15_Image_Convolution
-/path/to/adaptivecpp/bin/syclcc -o sycl-ex-15 -I../../Utilities/include/ -I../../External/stb --adaptivecpp-targets="<target specification>" reference.cpp
+/path/to/adaptivecpp/bin/acpp -o sycl-ex-15 -I../../Utilities/include/ -I../../External/stb --acpp-targets="<target specification>" reference.cpp
 ```