format

Author: jzc

llvm/lib/SYCLLowerIR/SYCLPropagateAspectsUsage.cpp

@@ -666,8 +666,8 @@ void processDeclaredVirtualFunctionSets(
   if (!F->hasFnAttribute("calls-indirectly"))
     return;
 
-  // "Construction" kernels which reference vtables but do not actually 
-  // perform any virtual calls have the calls-indirectly attribute 
+  // "Construction" kernels which reference vtables but do not actually
+  // perform any virtual calls have the calls-indirectly attribute
   // attached by SYCLVirtualFunctionAnalysis pass. We do not want to
   // attach sycl_used_aspects metadata to such kernels.
   bool hasVirtualCall = false;
@@ -682,7 +682,7 @@ void processDeclaredVirtualFunctionSets(
   }
   if (!hasVirtualCall)
     return;
-  
+
   Attribute CallsIndirectlyAttr = F->getFnAttribute("calls-indirectly");
   SmallVector<StringRef, 4> DeclaredVirtualFunctionSetNames;
   CallsIndirectlyAttr.getValueAsString().split(DeclaredVirtualFunctionSetNames,

sycl/test-e2e/VirtualFunctions/vf-optional-kernel-features.cpp

@@ -32,25 +32,31 @@ int main() {
   Base *Obj = sycl::malloc_shared<Base>(1, Q);
 
   Q.single_task<Constructor>([=]() {
-    // Even though at LLVM IR level this kernel does reference 'Base::foo'
-    // and 'Base::bar' through global variable containing `vtable` for `Base`,
-    // we do not consider the kernel to be using `fp64` optional feature.
-    new (Obj) Base;
-  }).wait();
+     // Even though at LLVM IR level this kernel does reference 'Base::foo'
+     // and 'Base::bar' through global variable containing `vtable` for `Base`,
+     // we do not consider the kernel to be using `fp64` optional feature.
+     new (Obj) Base;
+   }).wait();
 
-  Q.single_task<Use>(syclext::properties{syclext::assume_indirect_calls}, [=]() {
-    // This kernel is not considered to be using any optional features, because
-    // virtual functions in default set do not use any.
-    Obj->foo();
-  }).wait();
+  Q.single_task<Use>(syclext::properties{syclext::assume_indirect_calls},
+                     [=]() {
+                       // This kernel is not considered to be using any optional
+                       // features, because virtual functions in default set do
+                       // not use any.
+                       Obj->foo();
+                     })
+      .wait();
 
   if (Q.get_device().has(sycl::aspect::fp64)) {
-    Q.single_task<UseFP64>(syclext::properties{syclext::assume_indirect_calls_to<set_fp64>},
-        [=]() {
-      // This kernel is considered to be using 'fp64' optional feature, because
-      // there is a virtual function in 'set_fp64' which uses double.
-      Obj->bar();
-    }).wait();
+    Q.single_task<UseFP64>(
+         syclext::properties{syclext::assume_indirect_calls_to<set_fp64>},
+         [=]() {
+           // This kernel is considered to be using 'fp64' optional feature,
+           // because there is a virtual function in 'set_fp64' which uses
+           // double.
+           Obj->bar();
+         })
+        .wait();
   }
 
   int nfails = 0;

sycl/unittests/Extensions/VirtualFunctions/RuntimeLinking.cpp

@@ -370,7 +370,7 @@ TEST(VirtualFunctions, DummyImages) {
 
   CapturedLinkingData.clear();
 
-  EXPECT_EQ(Plt.get_devices().size(), 2);
+  EXPECT_EQ(Plt.get_devices().size(), 2u);
   sycl::queue Q2(sycl::aspect_selector({}, {sycl::aspect::fp64}));
 
   // We now repeat what we did launching KernelH but on another