fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

compiler/clc: Clean ups

Browse source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9156>
This commit is contained in:
Jason Ekstrand 2021-02-18 23:28:30 -06:00 • committed by Marge Bot
parent 1506ea2ecb
commit 8490766f53
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/compiler/clc/clc_helpers.cpp
View file

@ -50,10 +50,7 @@
#include "util/macros.h"
#include "glsl_types.h"
#include "nir.h"
#include "nir_types.h"
#include "clc_helpers.h"
#include "spirv.h"
#include "opencl-c.h.h"
@ -147,8 +144,6 @@ public:
uint32_t funcId = ins->words[op->offset];
SPIRVKernelInfo *kernel = NULL;
for (auto &kernel : kernels) {
if (funcId == kernel.funcId && !kernel.args.size()) {
curKernel = &kernel;
@ -767,14 +762,13 @@ clc_compile_to_llvm_module(const struct clc_compile_args *args,
clang_opts.data() + clang_opts.size(),
#endif
diag)) {
log += "Couldn't create Clang invocation.\n";
clc_error(logger, log.c_str());
clc_error(logger, "%sCouldn't create Clang invocation.\n", log.c_str());
return {};
}
if (diag.hasErrorOccurred()) {
log += "Errors occurred during Clang invocation.\n";
clc_error(logger, log.c_str());
clc_error(logger, "%sErrors occurred during Clang invocation.\n",
log.c_str());
return {};
}
@ -837,8 +831,8 @@ clc_compile_to_llvm_module(const struct clc_compile_args *args,
// Compile the code
clang::EmitLLVMOnlyAction act(llvm_ctx.get());
if (!c->ExecuteAction(act)) {
log += "Error executing LLVM compilation action.\n";
clc_error(logger, log.c_str());
clc_error(logger, "%sError executing LLVM compilation action.\n",
log.c_str());
return {};
}
@ -854,8 +848,8 @@ llvm_mod_to_spirv(std::unique_ptr<::llvm::Module> mod,
std::string log;
std::ostringstream spv_stream;
if (!::llvm::writeSpirv(mod.get(), spv_stream, log)) {
log += "Translation from LLVM IR to SPIR-V failed.\n";
clc_error(logger, log.c_str());
clc_error(logger, "%sTranslation from LLVM IR to SPIR-V failed.\n",
log.c_str());
return -1;
}