Skip to content

Fix Vulkan glslc invocation command lines #13289

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Vulkan glslc invocation command lines #13289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 36 additions & 6 deletions ggml/src/ggml-vulkan/vulkan-shaders/vulkan-shaders-gen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,15 @@ const std::vector<std::string> type_names = {
};

namespace {
void execute_command(const std::string& command, std::string& stdout_str, std::string& stderr_str) {
void execute_command(
#ifdef _WIN32
const std::string& command,
#else
const std::vector<std::string>& command,
#endif
std::string& stdout_str,
std::string& stderr_str
) {
#ifdef _WIN32
HANDLE stdout_read, stdout_write;
HANDLE stderr_read, stderr_write;
Expand Down Expand Up @@ -136,7 +144,15 @@ int stdout_pipe[2];
dup2(stderr_pipe[1], STDERR_FILENO);
close(stdout_pipe[1]);
close(stderr_pipe[1]);
execl("/bin/sh", "sh", "-c", command.c_str(), (char*) nullptr);

std::vector<char*> argv;
Copy link
Collaborator

@jeffbolznv jeffbolznv May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you make this const char * can you eliminate the const cast?

argv.reserve(command.size());
for (const auto& part : command) {
argv.push_back(const_cast<char*>(part.c_str()));
}
argv.push_back(nullptr);
execv(argv[0], argv.data());

_exit(EXIT_FAILURE);
} else {
close(stdout_pipe[1]);
Expand Down Expand Up @@ -220,13 +236,19 @@ void string_to_spv_func(const std::string& _name, const std::string& in_fname, c

std::string target_env = (name.find("_cm2") != std::string::npos) ? "--target-env=vulkan1.3" : "--target-env=vulkan1.2";

std::vector<std::string> cmd = {GLSLC, "-fshader-stage=compute", target_env};

// disable spirv-opt for coopmat shaders for https://github.com/ggerganov/llama.cpp/issues/10734
std::string opt_level = coopmat ? "" : "-O";
if (!coopmat) cmd.push_back("-O");

#ifdef _WIN32
std::vector<std::string> cmd = {GLSLC, "-fshader-stage=compute", target_env, opt_level, "\"" + in_path + "\"", "-o", "\"" + out_fname + "\""};
cmd.push_back("\"" + in_path + "\"");
cmd.push_back("-o");
cmd.push_back("\"" + out_fname + "\"");
#else
std::vector<std::string> cmd = {GLSLC, "-fshader-stage=compute", target_env, opt_level, in_path, "-o", out_fname};
cmd.push_back(in_path);
cmd.push_back("-o");
cmd.push_back(out_fname);
#endif

#ifdef GGML_VULKAN_SHADER_DEBUG_INFO
Expand All @@ -250,7 +272,15 @@ void string_to_spv_func(const std::string& _name, const std::string& in_fname, c
// }
// std::cout << std::endl;

execute_command(command, stdout_str, stderr_str);
execute_command(
#ifdef _WIN32
command,
Copy link
Collaborator

@jeffbolznv jeffbolznv May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe move the loop at line 263 into execute_command and just pass the cmd vector here.

#else
cmd,
#endif
stdout_str,
stderr_str
);
if (!stderr_str.empty()) {
std::cerr << "cannot compile " << name << "\n\n" << command << "\n\n" << stderr_str << std::endl;
return;
Expand Down