From a7a0b4da504bd267541c6d8c046b9974b28d3b3a Mon Sep 17 00:00:00 2001 From: Soumi Manna Date: Tue, 2 Mar 2021 09:41:25 -0800 Subject: [PATCH 1/2] [SYCL] [Driver] Enable __SYCL_ID_QUERIES_FIT_IN_INT__ macro to default This patch enables __SYCL_ID_QUERIES_FIT_IN_INT__ macro to default. The option did not set correctly and was lost during pulldown conflict here: https://github.com/intel/llvm/pull/3094/commits/a52d3d3aa6c9ceb3340f1692deec9c0244f73902 Signed-off-by: Soumi Manna --- clang/include/clang/Driver/Options.td | 5 ++++- clang/test/Preprocessor/sycl-macro.cpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 61bad5a0b4aff..093e80b221d34 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2402,7 +2402,10 @@ def fsycl_device_code_lower_esimd : Flag<["-"], "fsycl-device-code-lower-esimd"> Flags<[CC1Option, CoreOption]>, HelpText<"Lower ESIMD-specific constructs">; def fno_sycl_device_code_lower_esimd : Flag<["-"], "fno-sycl-device-code-lower-esimd">, Flags<[CC1Option, CoreOption]>, HelpText<"Do not lower ESIMD-specific constructs">; -defm sycl_id_queries_fit_in_int: OptInFFlag<"sycl-id-queries-fit-in-int", "Assume", "Do not assume", " that SYCL ID queries fit within MAX_INT.", [CC1Option,CoreOption], LangOpts<"SYCLValueFitInMaxInt">>; +defm sycl_id_queries_fit_in_int: BoolFOption<"sycl-id-queries-fit-in-int", + LangOpts<"SYCLValueFitInMaxInt">, DefaultTrue, + PosFlag, NegFlag, + BothFlags<[CC1Option, CoreOption], " that SYCL ID queries fit within MAX_INT.">>; def fsycl_use_bitcode : Flag<["-"], "fsycl-use-bitcode">, Flags<[CC1Option, CoreOption]>, HelpText<"Use LLVM bitcode instead of SPIR-V in fat objects">; def fno_sycl_use_bitcode : Flag<["-"], "fno-sycl-use-bitcode">, diff --git a/clang/test/Preprocessor/sycl-macro.cpp b/clang/test/Preprocessor/sycl-macro.cpp index 8a0be0841da47..a6b08a06e2b5b 100644 --- a/clang/test/Preprocessor/sycl-macro.cpp +++ b/clang/test/Preprocessor/sycl-macro.cpp @@ -1,4 +1,5 @@ // RUN: %clang_cc1 %s -E -dM | FileCheck %s +// RUN: %clang_cc1 %s -fsycl -fsycl-is-device -E -dM | FileCheck --check-prefix=CHECK-SYCL-ID %s // RUN: %clang_cc1 %s -fsycl -fsycl-id-queries-fit-in-int -fsycl-is-host -sycl-std=2017 -E -dM | FileCheck --check-prefix=CHECK-SYCL-STD %s // RUN: %clang_cc1 %s -fsycl -fsycl-id-queries-fit-in-int -fsycl-is-device -sycl-std=2017 -E -dM | FileCheck --check-prefix=CHECK-SYCL-STD %s // RUN: %clang_cc1 %s -fsycl -fsycl-id-queries-fit-in-int -fsycl-is-device -sycl-std=2020 -E -dM | FileCheck --check-prefix=CHECK-SYCL-STD-2020 %s @@ -26,3 +27,4 @@ // CHECK-MSVC: #define __SYCL_ID_QUERIES_FIT_IN_INT__ 1 // CHECK-NO-SYCL_FIT_IN_INT-NOT:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1 +// CHECK-SYCL-ID:#define __SYCL_ID_QUERIES_FIT_IN_INT__ 1 From eac341298a90be54ca31dc15268239dc581656c1 Mon Sep 17 00:00:00 2001 From: Soumi Manna Date: Tue, 2 Mar 2021 10:01:22 -0800 Subject: [PATCH 2/2] Address review comments Signed-off-by: Soumi Manna --- clang/include/clang/Driver/Options.td | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 093e80b221d34..ae00b1d4d543c 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2404,7 +2404,7 @@ def fno_sycl_device_code_lower_esimd : Flag<["-"], "fno-sycl-device-code-lower-e Flags<[CC1Option, CoreOption]>, HelpText<"Do not lower ESIMD-specific constructs">; defm sycl_id_queries_fit_in_int: BoolFOption<"sycl-id-queries-fit-in-int", LangOpts<"SYCLValueFitInMaxInt">, DefaultTrue, - PosFlag, NegFlag, + PosFlag, NegFlag, BothFlags<[CC1Option, CoreOption], " that SYCL ID queries fit within MAX_INT.">>; def fsycl_use_bitcode : Flag<["-"], "fsycl-use-bitcode">, Flags<[CC1Option, CoreOption]>, HelpText<"Use LLVM bitcode instead of SPIR-V in fat objects">;