[SYCL][ROCm] Fixup architecture flag in lit tests

Author: npmiller

sycl/doc/GetStartedGuide.md

@@ -425,7 +425,8 @@ If CUDA support has been built, it is tested only if there are CUDA devices
 available.
 
 If testing with ROCm for AMD make sure to specify the GPU being used
-by adding `-mcpu=<target>` to the CMake variable
+by adding `-Xsycl-target-backend=amdgcn-amd-amdhsa-sycldevice
+--offload-arch=<target>` to the CMake variable
 `SYCL_CLANG_EXTRA_FLAGS`.
 
 #### Run DPC++ E2E test suite

sycl/test/lit.cfg.py

@@ -105,10 +105,11 @@
 
 if triple == 'amdgcn-amd-amdhsa-sycldevice':
     config.available_features.add('rocm_amd')
-    # For AMD the specific GPU has to be specified with -mcpu
-    if not re.match('.*-mcpu.*', config.sycl_clang_extra_flags):
-        raise Exception("Error: missing -mcpu flag when trying to run lit "  \
-                        "tests for AMD GPU, please add `-mcpu=<target>` to " \
+    # For AMD the specific GPU has to be specified with --offload-arch
+    if not re.match('.*--offload-arch.*', config.sycl_clang_extra_flags):
+        raise Exception("Error: missing --offload-arch flag when trying to "  \
+                        "run lit tests for AMD GPU, please add "              \
+                        "`-Xsycl-target-backend=amdgcn-amd-amdhsa-sycldevice --offload-arch=<target>` to " \
                         "the CMake variable SYCL_CLANG_EXTRA_FLAGS")
 
 # Set timeout for test = 10 mins

sycl/test/on-device/lit.cfg.py

@@ -242,11 +242,12 @@ def getDeviceCount(device_type):
        config.available_features.add('level_zero')
     elif rocm_amd:
        config.available_features.add('rocm_amd')
-       # For AMD the specific GPU has to be specified with -mcpu
-       if not re.match('.*-mcpu.*', config.sycl_clang_extra_flags):
-           raise Exception("Error: missing -mcpu flag when trying to run lit "  \
-                           "tests for AMD GPU, please add `-mcpu=<target>` to " \
-                           "the CMake variable SYCL_CLANG_EXTRA_FLAGS")
+       # For AMD the specific GPU has to be specified with --offload-arch
+       if not re.match('.*--offload-arch.*', config.sycl_clang_extra_flags):
+        raise Exception("Error: missing --offload-arch flag when trying to "  \
+                        "run lit tests for AMD GPU, please add "              \
+                        "`-Xsycl-target-backend=amdgcn-amd-amdhsa-sycldevice --offload-arch=<target>` to " \
+                        "the CMake variable SYCL_CLANG_EXTRA_FLAGS")
     elif rocm_nvidia:
        config.available_features.add('rocm_nvidia')