Skip to content

disable D_TYPE same as A_TYPE cast for rope shaders #16922

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

Closed
wants to merge 4 commits into from
Closed

disable D_TYPE same as A_TYPE cast for rope shaders #16922

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
9c0a8c8
fix: Expected input to have different bit width from Result Type: FCo…
futz12 Nov 1, 2025
d0b8372
fix: Expected input to have different bit width from Result Type: FCo…
futz12 Nov 1, 2025
2ea0562
Merge remote-tracking branch 'origin/master'
futz12 Nov 1, 2025
48c2bd8
add: fix issues/16860 comments
futz12 Nov 1, 2025
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
5 changes: 5 additions & 0 deletions ggml/src/ggml-vulkan/vulkan-shaders/rope_multi.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,13 @@ void main() {
const uint ix = channel_x*p.s2 + row_x*p.s1 + i0/2;

if (i0 >= p.n_dims) {
#ifdef ROPE_SAME_TYPE
data_d[idst + i0/2 + 0] = data_a[ix + i0/2 + 0];
data_d[idst + i0/2 + 1] = data_a[ix + i0/2 + 1];
#else
data_d[idst + i0/2 + 0] = D_TYPE(data_a[ix + i0/2 + 0]);
data_d[idst + i0/2 + 1] = D_TYPE(data_a[ix + i0/2 + 1]);
#endif

return;
}
Expand Down
5 changes: 5 additions & 0 deletions ggml/src/ggml-vulkan/vulkan-shaders/rope_neox.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ void main() {
}

if (i0 >= p.n_dims) {
#ifdef ROPE_SAME_TYPE
data_d[idst + i0/2 + 0] = data_a[ix + i0/2 + 0];
data_d[idst + i0/2 + 1] = data_a[ix + i0/2 + 1];
#else
data_d[idst + i0/2 + 0] = D_TYPE(data_a[ix + i0/2 + 0]);
data_d[idst + i0/2 + 1] = D_TYPE(data_a[ix + i0/2 + 1]);
#endif

return;
}
Expand Down
5 changes: 5 additions & 0 deletions ggml/src/ggml-vulkan/vulkan-shaders/rope_norm.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ void main() {
}

if (i0 >= p.n_dims) {
#ifdef ROPE_SAME_TYPE
data_d[idst + 0] = data_a[ix + 0];
data_d[idst + 1] = data_a[ix + 1];
#else
data_d[idst + 0] = D_TYPE(data_a[ix + 0]);
data_d[idst + 1] = D_TYPE(data_a[ix + 1]);
#endif

return;
}
Expand Down
7 changes: 5 additions & 2 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 @@ -317,8 +317,7 @@ void string_to_spv_func(std::string name, std::string in_path, std::string out_p

// disable spirv-opt for coopmat shaders for https://github.com/ggerganov/llama.cpp/issues/10734
// disable spirv-opt for bf16 shaders for https://github.com/ggml-org/llama.cpp/issues/15344
// disable spirv-opt for rope shaders for https://github.com/ggml-org/llama.cpp/issues/16860
std::string opt_level = (coopmat || name.find("bf16") != std::string::npos || name.find("rope") != std::string::npos) ? "" : "-O";
std::string opt_level = (coopmat || name.find("bf16") != std::string::npos) ? "" : "-O";

#ifdef _WIN32
std::vector<std::string> cmd = {GLSLC, "-fshader-stage=compute", target_env, opt_level, "\"" + in_path + "\"", "-o", "\"" + out_path + "\""};
Expand All @@ -339,6 +338,10 @@ void string_to_spv_func(std::string name, std::string in_path, std::string out_p
for (const auto& define : defines) {
cmd.push_back("-D" + define.first + "=" + define.second);
}
// disable D_TYPE same as A_TYPE cast for rope shaders https://github.com/ggml-org/llama.cpp/issues/16860
if (name.find("rope") != std::string::npos && defines["D_TYPE"] == defines["A_TYPE"] ) {
cmd.push_back("-DROPE_SAME_TYPE");
}

std::string command;
for (const auto& part : cmd) {
Expand Down