format and tests

Signed-off-by: Sidorov, Dmitry <[email protected]>

Author: MrSidims

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -2071,7 +2071,7 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
     // -foffload-fp32-prec-div JIT
     Args.AddLastArg(BeArgs, options::OPT_foffload_fp32_prec_div);
     // -foffload-fp32-prec-sqrt JIT
-    Args.AddLastArg(BeArgs, options::OPT_OPT_foffload_fp32_prec_sqrt);
+    Args.AddLastArg(BeArgs, options::OPT_foffload_fp32_prec_sqrt);
   }
   if (IsGen) {
     for (auto [DeviceName, BackendArgStr] : PerDeviceArgs) {

clang/test/Driver/sycl-foffload-fp32-prec-div.cpp

@@ -0,0 +1,13 @@
+// Test SYCL -foffload-fp32-prec-div
+
+// RUN: %clang -### -fsycl --offload-new-driver \
+// RUN:    -fsycl-targets=spir64_gen -foffload-fp32-prec-div %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=AOT %s
+
+// RUN: %clang -### -fsycl --offload-new-driver \
+// RUN:   -foffload-fp32-prec-div %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=JIT %s
+
+// AOT: clang-offload-packager{{.*}} "--image=file={{.*}}.bc,triple=spir64_gen-unknown-unknown,arch={{.*}},kind=sycl,compile-opts=-options -ze-fp32-correctly-rounded-divide-sqrt{{.*}}"
+
+// JIT: clang-offload-packager{{.*}} "--image=file={{.*}}.bc,triple=spir64-unknown-unknown,arch={{.*}} -foffload-fp32-prec-div"

clang/test/Driver/sycl-foffload-fp32-prec-sqrt.cpp

@@ -0,0 +1,13 @@
+// Test SYCL -foffload-fp32-prec-sqrt
+
+// RUN: %clang -### -fsycl --offload-new-driver \
+// RUN:    -fsycl-targets=spir64_gen -foffload-fp32-prec-sqrt %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=AOT %s
+
+// RUN: %clang -### -fsycl --offload-new-driver \
+// RUN:   -foffload-fp32-prec-sqrt %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=JIT %s
+
+// AOT: clang-offload-packager{{.*}} "--image=file={{.*}}.bc,triple=spir64_gen-unknown-unknown,arch={{.*}},kind=sycl,compile-opts=-options -ze-fp32-correctly-rounded-divide-sqrt{{.*}}"
+
+// JIT: clang-offload-packager{{.*}} "--image=file={{.*}}.bc,triple=spir64-unknown-unknown,arch={{.*}} -foffload-fp32-prec-sqrt"

llvm/lib/SYCLLowerIR/SYCLSqrtFDivMaxErrorCleanUp.cpp

@@ -17,9 +17,9 @@
 #include "llvm/SYCLLowerIR/SYCLSqrtFDivMaxErrorCleanUp.h"
 
 #include "llvm/ADT/SmallSet.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/IntrinsicInst.h"
+#include "llvm/IR/Module.h"
 
 using namespace llvm;
 
@@ -29,8 +29,7 @@ static constexpr char FDIV_ERROR[] = "2.5";
 } // namespace
 
 PreservedAnalyses
-SYCLSqrtFDivMaxErrorCleanUpPass::run(Module &M,
-                                     ModuleAnalysisManager &MAM) {
+SYCLSqrtFDivMaxErrorCleanUpPass::run(Module &M, ModuleAnalysisManager &MAM) {
   SmallVector<IntrinsicInst *, 16> WorkListSqrt;
   SmallVector<IntrinsicInst *, 16> WorkListFDiv;
 
@@ -48,22 +47,22 @@ SYCLSqrtFDivMaxErrorCleanUpPass::run(Module &M,
 
     for (auto *Use : F.users()) {
       auto *II = cast<IntrinsicInst>(Use);
-      if (II && II->getCalledFunction()->getName().
-          starts_with("llvm.fpbuiltin")) {
+      if (II &&
+          II->getCalledFunction()->getName().starts_with("llvm.fpbuiltin")) {
         // llvm.fpbuiltin.* intrinsics should always have fpbuiltin-max-error
         // attribute, but it's not a concern of the pass, so just do an early
         // exit here if the attribute is not attached.
         if (!II->getAttributes().hasFnAttr("fpbuiltin-max-error"))
           return PreservedAnalyses::none();
-        StringRef MaxError = II->getAttributes().getFnAttr(
-            "fpbuiltin-max-error").getValueAsString();
+        StringRef MaxError = II->getAttributes()
+                                 .getFnAttr("fpbuiltin-max-error")
+                                 .getValueAsString();
 
         if (ID == llvm::Intrinsic::fpbuiltin_sqrt) {
           if (MaxError != SQRT_ERROR)
             return PreservedAnalyses::none();
           WorkListSqrt.push_back(II);
-        }
-        else if (ID == llvm::Intrinsic::fpbuiltin_fdiv) {
+        } else if (ID == llvm::Intrinsic::fpbuiltin_fdiv) {
           if (MaxError != FDIV_ERROR)
             return PreservedAnalyses::none();
           WorkListFDiv.push_back(II);
@@ -113,9 +112,9 @@ SYCLSqrtFDivMaxErrorCleanUpPass::run(Module &M,
     Type *Ty = Sqrt->getType();
     AttributeList Attrs = Sqrt->getAttributes();
     Function *NewSqrtF =
-          Intrinsic::getDeclaration(&M, llvm::Intrinsic::sqrt, Ty);
-    auto *NewSqrt = Builder.CreateCall(NewSqrtF, { Sqrt->getOperand(0) },
-                                       Sqrt->getName());
+        Intrinsic::getDeclaration(&M, llvm::Intrinsic::sqrt, Ty);
+    auto *NewSqrt =
+        Builder.CreateCall(NewSqrtF, {Sqrt->getOperand(0)}, Sqrt->getName());
 
     // Copy FP flags, metadata and attributes. Replace old call with a new call.
     Attrs = Attrs.removeFnAttribute(Sqrt->getContext(), "fpbuiltin-max-error");
@@ -134,9 +133,8 @@ SYCLSqrtFDivMaxErrorCleanUpPass::run(Module &M,
     DeclToRemove.insert(FDiv->getCalledFunction());
     IRBuilder Builder(FDiv);
     Builder.SetInsertPoint(FDiv);
-    Instruction *NewFDiv =
-        cast<Instruction>(Builder.CreateFDiv(
-              FDiv->getOperand(0), FDiv->getOperand(1), FDiv->getName()));
+    Instruction *NewFDiv = cast<Instruction>(Builder.CreateFDiv(
+        FDiv->getOperand(0), FDiv->getOperand(1), FDiv->getName()));
 
     // Copy FP flags and metadata. Replace old call with a new instruction.
     cast<Instruction>(NewFDiv)->copyMetadata(*FDiv);

sycl/source/detail/program_manager/program_manager.cpp

@@ -447,16 +447,14 @@ static void appendCompileOptionsFromImage(std::string &CompileOpts,
       OptPos = CompileOpts.find(TargetRegisterAllocMode);
     }
     static const char *FP32PrecDiv = "-foffload-fp32-prec-div";
-    if (auto Pos = CompileOpts.find(FP32PrecDiv);
-        Pos != std::string::npos) {
+    if (auto Pos = CompileOpts.find(FP32PrecDiv); Pos != std::string::npos) {
       const char *BackendOption = nullptr;
       PlatformImpl->getBackendOption(FP32PrecDiv, &BackendOption);
       auto OptLen = strlen(FP32PrecDiv);
       CompileOpts.replace(Pos, OptLen, BackendOption);
     }
     static const char *FP32PrecSqrt = "-foffload-fp32-prec-sqrt";
-    if (auto Pos = CompileOpts.find(FP32PrecSqrt);
-        Pos != std::string::npos) {
+    if (auto Pos = CompileOpts.find(FP32PrecSqrt); Pos != std::string::npos) {
       const char *BackendOption = nullptr;
       PlatformImpl->getBackendOption(FP32PrecSqrt, &BackendOption);
       auto OptLen = strlen(FP32PrecSqrt);