OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clc: merge blocks handling optional features

Browse Source 
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27141>
This commit is contained in:
Karol Herbst
2024-01-18 14:19:45 +01:00
committed by Marge Bot
parent faea27e4ac
commit bd085c253c
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/compiler/clc/clc_helpers.cpp
View File

@@ -893,22 +893,21 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx,
#endif #endif
#endif #endif
// Enable/Disable optional OpenCL C features. Some can be toggled via `OpenCLExtensionsAsWritten`
// others we have to (un)define via macros ourselves.
// Undefine clang added SPIR(V) defines so we don't magically enable extensions // Undefine clang added SPIR(V) defines so we don't magically enable extensions
c->getPreprocessorOpts().addMacroUndef("__SPIR__"); c->getPreprocessorOpts().addMacroUndef("__SPIR__");
c->getPreprocessorOpts().addMacroUndef("__SPIRV__"); c->getPreprocessorOpts().addMacroUndef("__SPIRV__");
// clang defines those unconditionally, we need to fix that.
if (!args->features.int64)
c->getPreprocessorOpts().addMacroUndef("__opencl_c_int64");
if (!args->features.images)
c->getPreprocessorOpts().addMacroUndef("__IMAGE_SUPPORT__");
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("-all"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("-all");
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_byte_addressable_store"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_byte_addressable_store");
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_global_int32_base_atomics"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_global_int32_base_atomics");
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_global_int32_extended_atomics"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_global_int32_extended_atomics");
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_local_int32_base_atomics"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_local_int32_base_atomics");
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_local_int32_extended_atomics"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_local_int32_extended_atomics");
c->getPreprocessorOpts().addMacroDef("cl_khr_expect_assume=1");
if (args->features.fp16) { if (args->features.fp16) {
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_fp16"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_fp16");
} }
@@ -919,9 +918,15 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx,
if (args->features.int64) { if (args->features.int64) {
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cles_khr_int64"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cles_khr_int64");
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+__opencl_c_int64"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+__opencl_c_int64");
} else {
// clang defines this unconditionally, we need to fix that.
c->getPreprocessorOpts().addMacroUndef("__opencl_c_int64");
} }
if (args->features.images) { if (args->features.images) {
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+__opencl_c_images"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+__opencl_c_images");
} else {
// clang defines this unconditionally, we need to fix that.
c->getPreprocessorOpts().addMacroUndef("__IMAGE_SUPPORT__");
} }
if (args->features.images_read_write) { if (args->features.images_read_write) {
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+__opencl_c_read_write_images"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+__opencl_c_read_write_images");
@@ -935,20 +940,6 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx,
} }
if (args->features.subgroups) { if (args->features.subgroups) {
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+__opencl_c_subgroups"); c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+__opencl_c_subgroups");
}
if (args->features.subgroups_ifp) {
assert(args->features.subgroups);
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_subgroups");
}
// llvm handles these extensions differently so we have to pass those flags instead to expose the clc functions
c->getPreprocessorOpts().addMacroDef("cl_khr_expect_assume=1");
if (args->features.integer_dot_product) {
c->getPreprocessorOpts().addMacroDef("cl_khr_integer_dot_product=1");
c->getPreprocessorOpts().addMacroDef("__opencl_c_integer_dot_product_input_4x8bit_packed=1");
c->getPreprocessorOpts().addMacroDef("__opencl_c_integer_dot_product_input_4x8bit=1");
}
if (args->features.subgroups) {
if (args->features.subgroups_shuffle) { if (args->features.subgroups_shuffle) {
c->getPreprocessorOpts().addMacroDef("cl_khr_subgroup_shuffle=1"); c->getPreprocessorOpts().addMacroDef("cl_khr_subgroup_shuffle=1");
} }
@@ -956,6 +947,15 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx,
c->getPreprocessorOpts().addMacroDef("cl_khr_subgroup_shuffle_relative=1"); c->getPreprocessorOpts().addMacroDef("cl_khr_subgroup_shuffle_relative=1");
} }
} }
if (args->features.subgroups_ifp) {
assert(args->features.subgroups);
c->getTargetOpts().OpenCLExtensionsAsWritten.push_back("+cl_khr_subgroups");
}
if (args->features.integer_dot_product) {
c->getPreprocessorOpts().addMacroDef("cl_khr_integer_dot_product=1");
c->getPreprocessorOpts().addMacroDef("__opencl_c_integer_dot_product_input_4x8bit_packed=1");
c->getPreprocessorOpts().addMacroDef("__opencl_c_integer_dot_product_input_4x8bit=1");
}
if (args->num_headers) { if (args->num_headers) {
::llvm::SmallString<128> tmp_header_path; ::llvm::SmallString<128> tmp_header_path;