clang format hotfix

Author: HabKaffee

sycl/source/detail/program_manager/program_manager.cpp

@@ -367,26 +367,26 @@ RT::PiProgram ProgramManager::createPIProgram(const RTDeviceBinaryImage &Img,
 }
 
 static void addEsimdImageCompileOptions(std::string &CompileOpts) {
-    if (!CompileOpts.empty())
-      CompileOpts += " ";
-    CompileOpts += "-vc-codegen";
+  if (!CompileOpts.empty())
+    CompileOpts += " ";
+  CompileOpts += "-vc-codegen";
 }
 
 static void applyLinkOptionsFromImage(std::string &LinkOpts,
                                       const RTDeviceBinaryImage &Img) {
   if (!LinkOpts.empty())
-      LinkOpts += " ";
-  const char* TemporaryStr = Img.getLinkOptions();
+    LinkOpts += " ";
+  const char *TemporaryStr = Img.getLinkOptions();
   if (TemporaryStr != nullptr)
     LinkOpts += std::string(TemporaryStr);
 }
 
-static void applyCompileOptionsFromImage(std::string &CompileOpts,
-                                      const RTDeviceBinaryImage &Img,
-                                      const pi_device_binary_property &isEsimdImage = nullptr) {
+static void applyCompileOptionsFromImage(
+    std::string &CompileOpts, const RTDeviceBinaryImage &Img,
+    const pi_device_binary_property &isEsimdImage = nullptr) {
   if (!CompileOpts.empty())
     CompileOpts += " ";
-  const char* TemporaryStr = Img.getCompileOptions();
+  const char *TemporaryStr = Img.getCompileOptions();
   if (TemporaryStr != nullptr)
     CompileOpts += TemporaryStr;
   if (isEsimdImage) {
@@ -410,7 +410,8 @@ static void applyOptionsFromImage(std::string &CompileOpts,
   pi_device_binary_property isEsimdImage = Img.getProperty("isEsimdImage");
   if (!CompileOptsEnv) {
     applyCompileOptionsFromImage(CompileOpts, Img, isEsimdImage);
-  } else if (isEsimdImage && pi::DeviceBinaryProperty(isEsimdImage).asUint32()) {
+  } else if (isEsimdImage &&
+             pi::DeviceBinaryProperty(isEsimdImage).asUint32()) {
     addEsimdImageCompileOptions(CompileOpts);
   }
 
@@ -1008,8 +1009,8 @@ ProgramManager::ProgramPtr ProgramManager::build(
       Options += " " + LinkOptions;
     }
     RT::PiResult Error = Plugin.call_nocheck<PiApiKind::piProgramBuild>(
-        Program.get(), /*num devices =*/1, &Device, Options.c_str(),
-        nullptr, nullptr);
+        Program.get(), /*num devices =*/1, &Device, Options.c_str(), nullptr,
+        nullptr);
     if (Error != PI_SUCCESS)
       throw compile_program_error(getProgramBuildLog(Program.get(), Context),
                                   Error);
@@ -1730,7 +1731,8 @@ ProgramManager::link(const std::vector<device_image_plain> &DeviceImages,
   for (const device_image_plain &DeviceImage : DeviceImages) {
     const std::shared_ptr<device_image_impl> &InputImpl =
         getSyclObjImpl(DeviceImage);
-    applyLinkOptionsFromImage(LinkOptionsStr, *(InputImpl->get_bin_image_ref()));
+    applyLinkOptionsFromImage(LinkOptionsStr,
+                              *(InputImpl->get_bin_image_ref()));
   }
   const context &Context = getSyclObjImpl(DeviceImages[0])->get_context();
   const ContextImplPtr ContextImpl = getSyclObjImpl(Context);

sycl/unittests/program_manager/passing_link_and_compile_options.cpp

@@ -140,8 +140,8 @@ inline pi_result redefinedProgramCompile(pi_program, pi_uint32,
 inline pi_result redefinedProgramBuild(
     pi_program prog, pi_uint32, const pi_device *, const char *options,
     void (*pfn_notify)(pi_program program, void *user_data), void *user_data) {
-    assert(options != nullptr);
-    current_build_opts = std::string(options);
+  assert(options != nullptr);
+  current_build_opts = std::string(options);
   return PI_SUCCESS;
 }
 
@@ -186,7 +186,6 @@ TEST(Link_Compile_Options, compile_link_Options_Test_empty_options) {
   EXPECT_EQ(expected_options, current_compile_options);
 }
 
-
 TEST(Link_Compile_Options, compile_link_Options_Test_filled_options) {
   sycl::platform Plt{sycl::default_selector()};
   if (Plt.is_host()) {
@@ -211,12 +210,14 @@ TEST(Link_Compile_Options, compile_link_Options_Test_filled_options) {
   const sycl::device Dev = Plt.get_devices()[0];
   current_link_options.clear();
   current_compile_options.clear();
-  std::string expected_compile_options_1 = "-cl-opt-disable -cl-fp32-correctly-rounded-divide-sqrt",
-              expected_link_options_1 = "-cl-denorms-are-zero -cl-no-signed-zeros";
+  std::string expected_compile_options_1 =
+                  "-cl-opt-disable -cl-fp32-correctly-rounded-divide-sqrt",
+              expected_link_options_1 =
+                  "-cl-denorms-are-zero -cl-no-signed-zeros";
   static sycl::unittest::PiImage DevImage_1 =
       generateEAMTestKernel1Image<EAMTestKernel1>(expected_compile_options_1,
                                                   expected_link_options_1);
-  
+
   static sycl::unittest::PiImageArray<1> DevImageArray = {&DevImage_1};
   auto KernelID_1 = sycl::get_kernel_id<EAMTestKernel1>();
   sycl::queue Queue{Dev};
@@ -230,7 +231,8 @@ TEST(Link_Compile_Options, compile_link_Options_Test_filled_options) {
   EXPECT_EQ(expected_compile_options_1, current_compile_options);
 }
 
-TEST(Link_Compile_Options, compile_link_Options_Test_two_devices_filled_options) {
+TEST(Link_Compile_Options,
+     compile_link_Options_Test_two_devices_filled_options) {
   sycl::platform Plt{sycl::default_selector()};
   if (Plt.is_host()) {
     std::cerr << "Test is not supported on host, skipping\n";
@@ -255,7 +257,8 @@ TEST(Link_Compile_Options, compile_link_Options_Test_two_devices_filled_options)
   current_link_options.clear();
   current_compile_options.clear();
   std::string expected_compile_options_1 = "-cl-opt-disable",
-              expected_compile_options_2 = "-cl-fp32-correctly-rounded-divide-sqrt",
+              expected_compile_options_2 =
+                  "-cl-fp32-correctly-rounded-divide-sqrt",
               expected_link_options_1 = "-cl-denorms-are-zero",
               expected_link_options_2 = "-cl-no-signed-zeros";
   static sycl::unittest::PiImage DevImage_1 =
@@ -265,22 +268,26 @@ TEST(Link_Compile_Options, compile_link_Options_Test_two_devices_filled_options)
       generateEAMTestKernel2Image<EAMTestKernel2>(expected_compile_options_2,
                                                   expected_link_options_2);
   static sycl::unittest::PiImage Images[] = {DevImage_1, DevImage_2};
-  static sycl::unittest::PiImageArray<2> DevImageArray {Images};
-  
+  static sycl::unittest::PiImageArray<2> DevImageArray{Images};
+
   auto KernelID_1 = sycl::get_kernel_id<EAMTestKernel1>();
   auto KernelID_2 = sycl::get_kernel_id<EAMTestKernel2>();
   sycl::queue Queue{Dev_1};
   const sycl::context Ctx = Queue.get_context();
   sycl::kernel_bundle KernelBundle1 =
-      sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, {Dev_1}, {KernelID_1});
+      sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, {Dev_1},
+                                                         {KernelID_1});
   sycl::kernel_bundle KernelBundle2 =
-      sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, {Dev_1}, {KernelID_2});
+      sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, {Dev_1},
+                                                         {KernelID_2});
   auto BundleObj1 = sycl::compile(KernelBundle1);
   auto BundleObj2 = sycl::compile(KernelBundle2);
   sycl::link(BundleObj1);
   sycl::link(BundleObj2);
-  EXPECT_EQ(expected_link_options_1 + " " + expected_link_options_2, current_link_options);
-  EXPECT_EQ(expected_compile_options_1 + " " + expected_compile_options_2, current_compile_options);
+  EXPECT_EQ(expected_link_options_1 + " " + expected_link_options_2,
+            current_link_options);
+  EXPECT_EQ(expected_compile_options_1 + " " + expected_compile_options_2,
+            current_compile_options);
 }
 
 TEST(Link_Compile_Options, check_sycl_build) {
@@ -321,5 +328,6 @@ TEST(Link_Compile_Options, check_sycl_build) {
       sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, {Dev},
                                                          {KernelID});
   sycl::build(KernelBundle);
-  EXPECT_EQ(expected_compile_options + " " + expected_link_options, current_build_opts);
+  EXPECT_EQ(expected_compile_options + " " + expected_link_options,
+            current_build_opts);
 }