fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-19 03:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

clover/spirv: Don't call llvm::regularizeLlvmForSpirv

Browse source 
writeSpirv() already takes care of that, and calling it twice seems to
duplicate functions and cause problems when processing execution modes.

Fixes: 2043c5f37c "clover/llvm: Add functions for compiling from..."
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pierre Moreau <dev@pmoreau.org>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6306>
This commit is contained in:
Jason Ekstrand 2020-08-13 15:12:15 -05:00 • committed by Marge Bot
parent c84e2784eb
commit e3e45e2456
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/frontends/clover/llvm/invocation.cpp
View file

@ -460,11 +460,6 @@ clover::llvm::compile_to_spirv(const std::string &source,
const auto spirv_options = get_spirv_translator_options(dev);
std::string error_msg;
if (!::llvm::regularizeLlvmForSpirv(mod.get(), error_msg)) {
r_log += "Failed to regularize LLVM IR for SPIR-V: " + error_msg + ".\n";
throw error(CL_INVALID_VALUE);
}
std::ostringstream os;
if (!::llvm::writeSpirv(mod.get(), spirv_options, os, error_msg)) {
r_log += "Translation from LLVM IR to SPIR-V failed: " + error_msg + ".\n";