Corrections to temporarily disable tests expected to fail.

Author: rdeodhar

clang/lib/Sema/SemaSYCL.cpp

@@ -786,11 +786,16 @@ static void VisitField(CXXRecordDecl *Owner, RangeTy &&Item, QualType ItemTy,
     KF_FOR_EACH(handleSyclAccessorType, Item, ItemTy);
   else if (Util::isSyclStreamType(ItemTy))
     KF_FOR_EACH(handleSyclStreamType, Item, ItemTy);
+  else if (Util::isSyclSamplerType(ItemTy))
+    KF_FOR_EACH(handleSyclSamplerType, Item, ItemTy);
   else if (ItemTy->isStructureOrClassType())
     VisitAccessorWrapper(Owner, Item, ItemTy->getAsCXXRecordDecl(),
                          handlers...);
+#if 0
+  // FIXME Enable this when structs are replaced by their fields
   else if (ItemTy->isArrayType())
     VisitArrayElements(Item, ItemTy, handlers...);
+#endif
 }
 
 template <typename RangeTy, typename... Handlers>

clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp

@@ -1,5 +1,6 @@
 // RUN: %clang -I %S/Inputs -fsycl-device-only -Xclang -fsycl-int-header=%t.h %s -c -o %T/kernel.spv
 // RUN: FileCheck -input-file=%t.h %s
+// XFAIL: *
 
 // This test checks the integration header generated when
 // the kernel argument is an Accessor array.

clang/test/CodeGenSYCL/kernel-param-acc-array.cpp

@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fsycl -fsycl-is-device -I %S/Inputs -triple spir64-unknown-unknown-sycldevice -disable-llvm-passes -emit-llvm %s -o - | FileCheck %s
+// XFAIL: *
 
 // This test checks a kernel argument that is an Accessor array
 

clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp

@@ -1,5 +1,6 @@
 // RUN: %clang -I %S/Inputs -fsycl-device-only -Xclang -fsycl-int-header=%t.h %s -c -o %T/kernel.spv
 // RUN: FileCheck -input-file=%t.h %s
+// XFAIL: *
 
 // This test checks the integration header when kernel argument
 // is a struct containing an Accessor array.

clang/test/CodeGenSYCL/kernel-param-member-acc-array.cpp

@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fsycl -fsycl-is-device -I %S/Inputs -fsycl-int-header=%t.h -triple spir64-unknown-unknown-sycldevice -disable-llvm-passes -emit-llvm %s -o - | FileCheck %s
+// XFAIL: *
 
 // This test checks a kernel with struct parameter that contains an Accessor array.
 

clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp

@@ -1,5 +1,6 @@
 // RUN: %clang -I %S/Inputs -fsycl-device-only -Xclang -fsycl-int-header=%t.h %s -c -o %T/kernel.spv
 // RUN: FileCheck -input-file=%t.h %s
+// XFAIL: *
 
 // This test checks the integration header generated for a kernel
 // with an argument that is a POD array.

clang/test/CodeGenSYCL/kernel-param-pod-array.cpp

@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fsycl -fsycl-is-device -I %S/Inputs -triple spir64-unknown-unknown-sycldevice -disable-llvm-passes -emit-llvm %s -o - | FileCheck %s
+// XFAIL: *
 
 // This test checks a kernel with an argument that is a POD array.
 

clang/test/SemaSYCL/array-kernel-param.cpp

@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -I %S/Inputs -fsycl -fsycl-is-device -ast-dump %s | FileCheck %s
+// XFAIL: *
 
 // This test checks that compiler generates correct kernel arguments for
 // arrays, Accessor arrays, and structs containing Accessors.

sycl/test/array_param/array-kernel-param-run.cpp

@@ -5,6 +5,7 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
+// XFAIL: *
 
 #include <CL/sycl.hpp>
 #include <iostream>