Default to "vectorcall" calling convention for Windows AMD64 if "odin"/"contextless"

This commit is contained in:
gingerBill
2026-04-07 16:04:07 +01:00
parent 6f7226e692
commit 6480504e39
4 changed files with 45 additions and 22 deletions

View File

@@ -131,6 +131,25 @@ gb_internal LLVMTypeRef lb_function_type_to_llvm_raw(lbFunctionType *ft, bool is
// }
gb_internal void lb_add_function_calling_convention(LLVMValueRef fn, ProcCallingConvention calling_convention) {
lbCallingConventionKind cc_kind = lbCallingConvention_C;
// TODO(bill): Clean up this logic
if (!is_arch_wasm()) {
cc_kind = lb_calling_convention_map[calling_convention];
}
if (build_context.metrics.os == TargetOs_windows &&
build_context.metrics.arch == TargetArch_amd64) {
switch (calling_convention) {
case ProcCC_Odin:
case ProcCC_Contextless:
cc_kind = lbCallingConvention_X86_VectorCall;
break;
}
}
LLVMSetFunctionCallConv(fn, cc_kind);
}
gb_internal void lb_add_function_type_attributes(LLVMValueRef fn, lbFunctionType *ft, ProcCallingConvention calling_convention) {
if (ft == nullptr) {
return;
@@ -184,23 +203,7 @@ gb_internal void lb_add_function_type_attributes(LLVMValueRef fn, lbFunctionType
LLVMAddAttributeAtIndex(fn, offset, noalias_attr);
}
lbCallingConventionKind cc_kind = lbCallingConvention_C;
// TODO(bill): Clean up this logic
if (!is_arch_wasm()) {
cc_kind = lb_calling_convention_map[calling_convention];
}
// if (build_context.metrics.arch == TargetArch_amd64) {
// if (build_context.metrics.os == TargetOs_windows) {
// if (cc_kind == lbCallingConvention_C) {
// cc_kind = lbCallingConvention_Win64;
// }
// } else {
// if (cc_kind == lbCallingConvention_C) {
// cc_kind = lbCallingConvention_X86_64_SysV;
// }
// }
// }
LLVMSetFunctionCallConv(fn, cc_kind);
lb_add_function_calling_convention(fn, calling_convention);
if (calling_convention == ProcCC_Odin) {
unsigned context_index = arg_index;
LLVMAddAttributeAtIndex(fn, context_index, noalias_attr);
@@ -498,6 +501,15 @@ namespace lbAbiAmd64Win64 {
args[i] = lb_arg_type_indirect(t, nullptr);
break;
}
}
if (kind == LLVMVectorTypeKind) {
i64 sz = lb_sizeof(t);
if (sz <= 32) {
args[i] = lb_arg_type_direct(t, t, nullptr, nullptr);
} else {
args[i] = lbAbi386::non_struct(c, t, false);
}
} else {
args[i] = lbAbi386::non_struct(c, t, false);
}
@@ -522,6 +534,16 @@ namespace lbAbiAmd64Win64 {
LLVMAttributeRef attr = lb_create_enum_attribute_with_type(c, "sret", return_type);
return lb_arg_type_indirect(return_type, attr);
}
if (lb_is_type_kind(return_type, LLVMVectorTypeKind)) {
i64 sz = lb_sizeof(return_type);
if (sz <= 32) {
return lb_arg_type_direct(return_type, return_type, nullptr, nullptr);
}
return lb_arg_type_indirect(return_type, nullptr);
}
return lbAbi386::non_struct(c, return_type, true);
}
};

View File

@@ -429,11 +429,7 @@ gb_internal lbProcedure *lb_create_dummy_procedure(lbModule *m, String link_name
p->value = LLVMAddFunction(m->mod, c_link_name, func_type);
Type *pt = p->type;
lbCallingConventionKind cc_kind = lbCallingConvention_C;
if (!is_arch_wasm()) {
cc_kind = lb_calling_convention_map[pt->Proc.calling_convention];
}
LLVMSetFunctionCallConv(p->value, cc_kind);
lb_add_function_calling_convention(p->value, pt->Proc.calling_convention);
lbValue proc_value = {p->value, p->type};
lb_add_member(m, p->name, proc_value);
lb_add_procedure_value(m, p);

View File

@@ -4088,6 +4088,8 @@ gb_internal ProcCallingConvention string_to_calling_convention(String const &s)
if (s == "none") return ProcCC_None;
if (s == "naked") return ProcCC_Naked;
if (s == "vectorcall") return ProcCC_VectorCall;
if (s == "win64") return ProcCC_Win64;
if (s == "sysv") return ProcCC_SysV;

View File

@@ -305,6 +305,8 @@ enum ProcCallingConvention : i32 {
ProcCC_PreserveMost = 12,
ProcCC_PreserveAll = 13,
ProcCC_VectorCall = 14,
ProcCC_MAX,
@@ -326,6 +328,7 @@ gb_global char const *proc_calling_convention_strings[ProcCC_MAX] = {
"preserve/none",
"preserve/most",
"preserve/all",
"vectorcall",
};
gb_internal ProcCallingConvention default_calling_convention(void) {