Skip to content

[ESIMD] Let ESIMD attributes not depend on -fsycl-explicit-simd #3446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bader merged 2 commits into from
Mar 31, 2021
Merged

[ESIMD] Let ESIMD attributes not depend on -fsycl-explicit-simd #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eba9591
[ESIMD] Let ESIMD attributes not depend on -fsycl-explicit-simd
DenisBakhvalov Mar 30, 2021
1928c22
Changed tests to reflect the change
DenisBakhvalov Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions clang/include/clang/Basic/Attr.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,6 @@ def SYCL : LangOpt<"SYCL">;
def SYCLIsDevice : LangOpt<"SYCLIsDevice">;
def SYCLIsHost : LangOpt<"SYCLIsHost">;
def SilentlyIgnoreSYCLIsHost : LangOpt<"SYCLIsHost", "", 1>;
def SYCLExplicitSIMD : LangOpt<"SYCLExplicitSIMD">;
def COnly : LangOpt<"", "!LangOpts.CPlusPlus">;
def CPlusPlus : LangOpt<"CPlusPlus">;
def OpenCL : LangOpt<"OpenCL">;
Expand Down Expand Up @@ -1192,7 +1191,6 @@ def SYCLSimd : InheritableAttr {
let Spellings = [GNU<"sycl_explicit_simd">,
CXX11<"intel", "sycl_explicit_simd">];
let Subjects = SubjectList<[Function, GlobalVar]>;
let LangOpts = [SYCLExplicitSIMD];
let Documentation = [SYCLSimdDocs];
let SupportsNonconformingLambdaSyntax = 1;
}
Expand All @@ -1205,7 +1203,6 @@ def SYCLRegisterNum : InheritableAttr {
let Subjects = SubjectList<[GlobalVar]>;
// This attribute is applied to file-scope variables and must be compilable
// for the host device as well
let LangOpts = [SYCLExplicitSIMD];
let Documentation = [SYCLRegisterNumDocs];
}

Expand All @@ -1218,7 +1215,6 @@ def SYCLSimdAccessorPtr : InheritableAttr {
// No spelling, as this attribute can't be created in the source code.
let Spellings = [];
let Subjects = SubjectList<[ParmVar]>;
let LangOpts = [SYCLExplicitSIMD];
let Documentation = [Undocumented];
}

Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGenSYCL/esimd-accessor-ptr-md.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// separate. So, we can split this test into 2, where one
// will be testing code generation and the second ESIMD lowering.
//
// RUN: %clang_cc1 -fsycl-explicit-simd -fsycl-is-device \
// RUN: %clang_cc1 -fsycl-is-device \
// RUN: -internal-isystem %S/Inputs -triple spir64-unknown-unknown-sycldevice \
// RUN: -disable-llvm-passes -emit-llvm %s -o %t
// RUN: sycl-post-link -split-esimd -lower-esimd -O0 -S %t -o %t.table
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGenSYCL/esimd-private-global.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// will be testing code generation and the second ESIMD lowering.
//
// RUN: %clang_cc1 -disable-llvm-passes -triple spir64-unknown-unknown-sycldevice \
// RUN: -fsycl-is-device -fsycl-explicit-simd -emit-llvm %s -o %t
// RUN: -fsycl-is-device -emit-llvm %s -o %t
// RUN: sycl-post-link -split-esimd -lower-esimd -O0 -S %t -o %t.table
// RUN: FileCheck %s -input-file=%t_esimd_0.ll

Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGenSYCL/esimd_metadata1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -disable-llvm-passes -triple spir64-unknown-unknown-sycldevice \
// RUN: -fsycl-is-device -fsycl-explicit-simd -S -emit-llvm %s -o - | \
// RUN: -fsycl-is-device -S -emit-llvm %s -o - | \
// RUN: FileCheck %s

// The test checks that:
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGenSYCL/esimd_metadata2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clang_cc1 -disable-llvm-passes -triple spir64-unknown-unknown-sycldevice -fsycl-is-device -fsycl-explicit-simd -S -emit-llvm %s -o - | FileCheck %s --check-prefixes CHECK,CHECK-ESIMD
// RUN: %clang_cc1 -disable-llvm-passes -triple spir64-unknown-unknown-sycldevice -fsycl-is-device -S -emit-llvm %s -o - | FileCheck %s --check-prefixes CHECK,CHECK-ESIMD

// This test checks that attribute !intel_reqd_sub_group_size !1
// is added for kernels with !sycl_explicit_simd
Expand Down
2 changes: 1 addition & 1 deletion clang/test/CodeGenSYCL/int_header_esimd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clang_cc1 -fsycl-explicit-simd -fsycl-is-device -internal-isystem %S/Inputs -fsycl-int-header=%t.h %s
// RUN: %clang_cc1 -fsycl-is-device -internal-isystem %S/Inputs -fsycl-int-header=%t.h %s
// RUN: FileCheck -input-file=%t.h %s

// This test checks that
Expand Down
2 changes: 1 addition & 1 deletion clang/test/SemaSYCL/esimd-private-glob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// RUN: %clang_cc1 -fsycl-is-device -fsycl-explicit-simd -fsyntax-only -verify %s
// RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -verify %s
// expected-no-diagnostics
int x = 0;
2 changes: 1 addition & 1 deletion clang/test/SemaSYCL/esimd-private-global.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clang_cc1 -fsycl-is-device -fsycl-explicit-simd -fsyntax-only -verify -pedantic %s
// RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -verify -pedantic %s

// This test checks specifics of semantic analysis of ESIMD private globals

Expand Down
2 changes: 1 addition & 1 deletion clang/test/SemaSYCL/sycl-esimd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clang_cc1 -fsycl-is-device -fsycl-explicit-simd -fsyntax-only -Wno-sycl-2017-compat -verify %s
// RUN: %clang_cc1 -fsycl-is-device -fsyntax-only -Wno-sycl-2017-compat -verify %s

// This test checks specifics of semantic analysis of ESIMD kernels.

Expand Down