From 9d2ddf26967283ade8b9cf0db05d3a7b1e017e8c Mon Sep 17 00:00:00 2001 From: "aidan.belton" Date: Thu, 27 Jan 2022 14:22:34 +0000 Subject: [PATCH 1/4] change local accessor check --- clang/lib/Driver/ToolChains/Clang.cpp | 3 ++- clang/test/Driver/sycl-local-accessor-opt.cpp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 48d1d0ca4a082..b27a7aee8bbd8 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5791,7 +5791,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } // Enable local accessor to shared memory pass for SYCL. - if (isa(JA) && IsSYCL) { + if (isa(JA) && IsSYCLOffloadDevice && (Triple.isNVPTX() || + Triple.isAMDGCN())) { CmdArgs.push_back("-mllvm"); CmdArgs.push_back("-sycl-enable-local-accessor"); } diff --git a/clang/test/Driver/sycl-local-accessor-opt.cpp b/clang/test/Driver/sycl-local-accessor-opt.cpp index 855ef09e801e9..595524bcfb2d5 100644 --- a/clang/test/Driver/sycl-local-accessor-opt.cpp +++ b/clang/test/Driver/sycl-local-accessor-opt.cpp @@ -9,3 +9,7 @@ // RUN: %clang -fsycl -fsycl-targets=nvptx64-nvidia-cuda -### %s 2>&1 \ // RUN: | FileCheck %s // CHECK: "-sycl-enable-local-accessor" + +// RUN: %clang -fsycl -fsycl-targets=nvptx64-nvidia-cuda -S -### %s 2>&1 \ +// RUN: | FileCheck %s +// CHECK: "-sycl-enable-local-accessor" From 067276a63d8e8d9a7043782d8ce56f7b963a3f65 Mon Sep 17 00:00:00 2001 From: "aidan.belton" Date: Thu, 27 Jan 2022 14:51:29 +0000 Subject: [PATCH 2/4] clang format --- clang/lib/Driver/ToolChains/Clang.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index b27a7aee8bbd8..8ead9bda2f653 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5791,8 +5791,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } // Enable local accessor to shared memory pass for SYCL. - if (isa(JA) && IsSYCLOffloadDevice && (Triple.isNVPTX() || - Triple.isAMDGCN())) { + if (isa(JA) && IsSYCLOffloadDevice && + (Triple.isNVPTX() || Triple.isAMDGCN())) { CmdArgs.push_back("-mllvm"); CmdArgs.push_back("-sycl-enable-local-accessor"); } From 9b543f36c255fd2e6ea054633196a773df2c6961 Mon Sep 17 00:00:00 2001 From: "aidan.belton" Date: Thu, 27 Jan 2022 15:32:23 +0000 Subject: [PATCH 3/4] fix test --- clang/test/Driver/sycl-local-accessor-opt.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/clang/test/Driver/sycl-local-accessor-opt.cpp b/clang/test/Driver/sycl-local-accessor-opt.cpp index 595524bcfb2d5..8870fde0da79e 100644 --- a/clang/test/Driver/sycl-local-accessor-opt.cpp +++ b/clang/test/Driver/sycl-local-accessor-opt.cpp @@ -4,12 +4,11 @@ // RUN: %clang -fsycl -### %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK-NO-OPT %s -// CHECK-NO-OPT-NOT: "-sycl-enable-local-accessor" -// RUN: %clang -fsycl -fsycl-targets=nvptx64-nvidia-cuda -### %s 2>&1 \ -// RUN: | FileCheck %s -// CHECK: "-sycl-enable-local-accessor" +// RUN: %clang -fsycl -S -### %s 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-NO-OPT %s +// CHECK-NO-OPT: "-sycl-enable-local-accessor" -// RUN: %clang -fsycl -fsycl-targets=nvptx64-nvidia-cuda -S -### %s 2>&1 \ +// RUN: %clang -fsycl -fsycl-targets=nvptx64-nvidia-cuda -### %s 2>&1 \ // RUN: | FileCheck %s // CHECK: "-sycl-enable-local-accessor" From bfef6298aacf4aa315e74bb34bde2f72aeee6520 Mon Sep 17 00:00:00 2001 From: "aidan.belton" Date: Thu, 27 Jan 2022 16:56:00 +0000 Subject: [PATCH 4/4] change check-not --- clang/test/Driver/sycl-local-accessor-opt.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/test/Driver/sycl-local-accessor-opt.cpp b/clang/test/Driver/sycl-local-accessor-opt.cpp index 8870fde0da79e..154eee5178d8c 100644 --- a/clang/test/Driver/sycl-local-accessor-opt.cpp +++ b/clang/test/Driver/sycl-local-accessor-opt.cpp @@ -3,11 +3,11 @@ // REQUIRES: clang-driver // RUN: %clang -fsycl -### %s 2>&1 \ -// RUN: | FileCheck -check-prefix=CHECK-NO-OPT %s +// RUN: | FileCheck -check-prefix=OPT-CHECK %s // RUN: %clang -fsycl -S -### %s 2>&1 \ -// RUN: | FileCheck -check-prefix=CHECK-NO-OPT %s -// CHECK-NO-OPT: "-sycl-enable-local-accessor" +// RUN: | FileCheck -check-prefix=OPT-CHECK %s +// OPT-CHECK-NOT: "-sycl-enable-local-accessor" // RUN: %clang -fsycl -fsycl-targets=nvptx64-nvidia-cuda -### %s 2>&1 \ // RUN: | FileCheck %s