Skip to content

[SYCL] Remove re-flower pass #171

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
merged 4 commits into from
May 29, 2019
Merged

[SYCL] Remove re-flower pass #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c30d8b
[SYCL] Remove re-flower pass from clang
Fznamznon May 24, 2019
e09441c
[SYCL] Add aliases to OpenCL event and sampler types for SYCL
Fznamznon May 24, 2019
e114d6e
[SYCL] Use SPIRV-friendly built-in naming scheme
Fznamznon May 24, 2019
7287fff
[SYCL] Update SYCL clang tests
Fznamznon May 27, 2019
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
2 changes: 1 addition & 1 deletion clang/lib/AST/ASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target,
InitBuiltinType(ObjCBuiltinClassTy, BuiltinType::ObjCClass);
InitBuiltinType(ObjCBuiltinSelTy, BuiltinType::ObjCSel);

if (LangOpts.OpenCL) {
if (LangOpts.OpenCL || LangOpts.SYCLIsDevice) {
#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \
InitBuiltinType(SingletonId, BuiltinType::Id);
#include "clang/Basic/OpenCLImageTypes.def"
Expand Down
5 changes: 0 additions & 5 deletions clang/lib/CodeGen/BackendUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/LangOptions.h"
#include "clang/Basic/TargetOptions.h"
#include "clang/CodeGen/OclCxxRewrite/BifNameReflower.h"
#include "clang/Frontend/FrontendDiagnostic.h"
#include "clang/Frontend/Utils.h"
#include "clang/Lex/HeaderSearchOptions.h"
Expand Down Expand Up @@ -817,10 +816,6 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
PerFunctionPasses.add(
createTargetTransformInfoWrapperPass(getTargetIRAnalysis()));

if (LangOpts.SYCLIsDevice) {
PerModulePasses.add(createOclCxxBifNameReflowerPass());
}

CreatePasses(PerModulePasses, PerFunctionPasses);

legacy::PassManager CodeGenPasses;
Expand Down
3 changes: 0 additions & 3 deletions clang/lib/CodeGen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
add_subdirectory(OclCxxRewrite)

set(LLVM_LINK_COMPONENTS
Analysis
BitReader
Expand Down Expand Up @@ -107,5 +105,4 @@ add_clang_library(clangCodeGen
clangFrontend
clangLex
clangSerialization
clangOclCxxRewrite
)
2 changes: 1 addition & 1 deletion clang/lib/CodeGen/CodeGenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO,

if (LangOpts.ObjC)
createObjCRuntime();
if (LangOpts.OpenCL)
if (LangOpts.OpenCL || LangOpts.SYCLIsDevice)
createOpenCLRuntime();
if (LangOpts.OpenMP)
createOpenMPRuntime();
Expand Down
Loading