Regenerate wrappers for ROCm v6.3.3

Author: amontoison

gen/rocblas/rocblas-generator.toml

@@ -2,6 +2,7 @@
 library_name = "librocblas"
 output_file_path = "./librocblas.jl"
 export_symbol_prefixes = []
+print_using_CEnum = false
 
 [codegen]
 use_ccall_macro = true

gen/rocfft/rocfft-generator.toml

@@ -2,6 +2,7 @@
 library_name = "librocfft"
 output_file_path = "./librocfft.jl"
 export_symbol_prefixes = []
+print_using_CEnum = false
 
 [codegen]
 use_ccall_macro = true

gen/rocsolver/generator.jl

@@ -5,26 +5,33 @@ using Clang, Clang.Generators
 using JuliaFormatter
 
 include_dir = normpath("/opt/rocm/include")
-
-rocsolver_dir  = joinpath(include_dir, "rocsolver")
+rocblas_dir = joinpath(include_dir, "rocblas", "internal")
+rocsolver_dir = joinpath(include_dir, "rocsolver")
 options = load_options("rocsolver/rocsolver-generator.toml")
 
 args = get_default_args()
-push!(args, "-I$include_dir")
+push!(args, "-I$rocsolver_dir", "-I$rocblas_dir", "-DROCSOLVER_EXPORT")
 
-headers = [
+headers_rocsolver = [
     joinpath(rocsolver_dir, header)
     for header in readdir(rocsolver_dir)
     if endswith(header, ".h")
 ]
 
-ctx = create_context(headers, args, options)
+headers_rocblas = [
+    joinpath(rocblas_dir, header)
+    for header in readdir(rocblas_dir)
+    if endswith(header, ".h")
+]
+
+ctx = create_context(headers_rocsolver ∪
+ headers_rocblas, args, options)
 build!(ctx, BUILDSTAGE_NO_PRINTING)
 
 # Only keep the wrapped headers because the dependencies are already wrapped with other headers.
 replace!(get_nodes(ctx.dag)) do node
     path = Clang.get_filename(node.cursor)
-    should_wrap = any(headers) do header
+    should_wrap = any(headers_rocsolver) do header
         occursin(header, path)
     end
     if !should_wrap

gen/rocsolver/rocsolver-generator.toml

@@ -2,6 +2,7 @@
 library_name = "librocsolver"
 output_file_path = "./librocsolver.jl"
 export_symbol_prefixes = []
+print_using_CEnum = false
 
 [codegen]
 use_ccall_macro = true

gen/rocsparse/rocsparse-generator.toml

@@ -2,6 +2,7 @@
 library_name = "librocsparse"
 output_file_path = "./librocsparse.jl"
 export_symbol_prefixes = []
+print_using_CEnum = false
 
 [codegen]
 use_ccall_macro = true

src/blas/librocblas.jl

@@ -67,133 +67,202 @@ end
 
 const rocfft_array_type = rocfft_array_type_e
 
+@cenum rocfft_comm_type_e::UInt32 begin
+    rocfft_comm_none = 0
+    rocfft_comm_mpi = 1
+end
+
+const rocfft_comm_type = rocfft_comm_type_e
+
 function rocfft_setup()
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_setup, librocfft), rocfft_status, ())
+    @check @ccall librocfft.rocfft_setup()::rocfft_status
 end
 
 function rocfft_cleanup()
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_cleanup, librocfft), rocfft_status, ())
+    @check @ccall librocfft.rocfft_cleanup()::rocfft_status
 end
 
-function rocfft_plan_create(plan, placement, transform_type, precision, dimensions, lengths, number_of_transforms, description)
+function rocfft_plan_create(plan, placement, transform_type, precision, dimensions, lengths,
+                            number_of_transforms, description)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_create, librocfft), rocfft_status, (Ptr{rocfft_plan}, rocfft_result_placement, rocfft_transform_type, rocfft_precision, Csize_t, Ptr{Csize_t}, Csize_t, rocfft_plan_description), plan, placement, transform_type, precision, dimensions, lengths, number_of_transforms, description)
+    @check @ccall librocfft.rocfft_plan_create(plan::Ptr{rocfft_plan},
+                                               placement::rocfft_result_placement,
+                                               transform_type::rocfft_transform_type,
+                                               precision::rocfft_precision,
+                                               dimensions::Csize_t,
+                                               lengths::Ptr{Csize_t},
+                                               number_of_transforms::Csize_t,
+                                               description::rocfft_plan_description)::rocfft_status
 end
 
 function rocfft_execute(plan, in_buffer, out_buffer, info)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_execute, librocfft), rocfft_status, (rocfft_plan, Ptr{Ptr{Cvoid}}, Ptr{Ptr{Cvoid}}, rocfft_execution_info), plan, in_buffer, out_buffer, info)
+    @check @ccall librocfft.rocfft_execute(plan::rocfft_plan, in_buffer::Ptr{Ptr{Cvoid}},
+                                           out_buffer::Ptr{Ptr{Cvoid}},
+                                           info::rocfft_execution_info)::rocfft_status
 end
 
 function rocfft_plan_destroy(plan)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_destroy, librocfft), rocfft_status, (rocfft_plan,), plan)
+    @check @ccall librocfft.rocfft_plan_destroy(plan::rocfft_plan)::rocfft_status
 end
 
 function rocfft_plan_description_set_scale_factor(description, scale_factor)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_description_set_scale_factor, librocfft), rocfft_status, (rocfft_plan_description, Cdouble), description, scale_factor)
+    @check @ccall librocfft.rocfft_plan_description_set_scale_factor(description::rocfft_plan_description,
+                                                                     scale_factor::Cdouble)::rocfft_status
 end
 
-function rocfft_plan_description_set_data_layout(description, in_array_type, out_array_type, in_offsets, out_offsets, in_strides_size, in_strides, in_distance, out_strides_size, out_strides, out_distance)
+function rocfft_plan_description_set_data_layout(description, in_array_type, out_array_type,
+                                                 in_offsets, out_offsets, in_strides_size,
+                                                 in_strides, in_distance, out_strides_size,
+                                                 out_strides, out_distance)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_description_set_data_layout, librocfft), rocfft_status, (rocfft_plan_description, rocfft_array_type, rocfft_array_type, Ptr{Csize_t}, Ptr{Csize_t}, Csize_t, Ptr{Csize_t}, Csize_t, Csize_t, Ptr{Csize_t}, Csize_t), description, in_array_type, out_array_type, in_offsets, out_offsets, in_strides_size, in_strides, in_distance, out_strides_size, out_strides, out_distance)
+    @check @ccall librocfft.rocfft_plan_description_set_data_layout(description::rocfft_plan_description,
+                                                                    in_array_type::rocfft_array_type,
+                                                                    out_array_type::rocfft_array_type,
+                                                                    in_offsets::Ptr{Csize_t},
+                                                                    out_offsets::Ptr{Csize_t},
+                                                                    in_strides_size::Csize_t,
+                                                                    in_strides::Ptr{Csize_t},
+                                                                    in_distance::Csize_t,
+                                                                    out_strides_size::Csize_t,
+                                                                    out_strides::Ptr{Csize_t},
+                                                                    out_distance::Csize_t)::rocfft_status
 end
 
 function rocfft_field_create(field)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_field_create, librocfft), rocfft_status, (Ptr{rocfft_field},), field)
+    @check @ccall librocfft.rocfft_field_create(field::Ptr{rocfft_field})::rocfft_status
 end
 
 function rocfft_field_destroy(field)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_field_destroy, librocfft), rocfft_status, (rocfft_field,), field)
+    @check @ccall librocfft.rocfft_field_destroy(field::rocfft_field)::rocfft_status
 end
 
 function rocfft_get_version_string(buf, len)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_get_version_string, librocfft), rocfft_status, (Ptr{Cchar}, Csize_t), buf, len)
+    @check @ccall librocfft.rocfft_get_version_string(buf::Ptr{Cchar},
+                                                      len::Csize_t)::rocfft_status
+end
+
+function rocfft_plan_description_set_comm(description, comm_type, comm_handle)
+    AMDGPU.prepare_state()
+    @check @ccall librocfft.rocfft_plan_description_set_comm(description::rocfft_plan_description,
+                                                             comm_type::rocfft_comm_type,
+                                                             comm_handle::Ptr{Cvoid})::rocfft_status
 end
 
 function rocfft_brick_create(brick, field_lower, field_upper, brick_stride, dim, deviceID)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_brick_create, librocfft), rocfft_status, (Ptr{rocfft_brick}, Ptr{Csize_t}, Ptr{Csize_t}, Ptr{Csize_t}, Csize_t, Cint), brick, field_lower, field_upper, brick_stride, dim, deviceID)
+    @check @ccall librocfft.rocfft_brick_create(brick::Ptr{rocfft_brick},
+                                                field_lower::Ptr{Csize_t},
+                                                field_upper::Ptr{Csize_t},
+                                                brick_stride::Ptr{Csize_t}, dim::Csize_t,
+                                                deviceID::Cint)::rocfft_status
 end
 
 function rocfft_brick_destroy(brick)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_brick_destroy, librocfft), rocfft_status, (rocfft_brick,), brick)
+    @check @ccall librocfft.rocfft_brick_destroy(brick::rocfft_brick)::rocfft_status
 end
 
 function rocfft_field_add_brick(field, brick)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_field_add_brick, librocfft), rocfft_status, (rocfft_field, rocfft_brick), field, brick)
+    @check @ccall librocfft.rocfft_field_add_brick(field::rocfft_field,
+                                                   brick::rocfft_brick)::rocfft_status
 end
 
 function rocfft_plan_description_add_infield(description, field)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_description_add_infield, librocfft), rocfft_status, (rocfft_plan_description, rocfft_field), description, field)
+    @check @ccall librocfft.rocfft_plan_description_add_infield(description::rocfft_plan_description,
+                                                                field::rocfft_field)::rocfft_status
 end
 
 function rocfft_plan_description_add_outfield(description, field)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_description_add_outfield, librocfft), rocfft_status, (rocfft_plan_description, rocfft_field), description, field)
+    @check @ccall librocfft.rocfft_plan_description_add_outfield(description::rocfft_plan_description,
+                                                                 field::rocfft_field)::rocfft_status
 end
 
 function rocfft_plan_get_work_buffer_size(plan, size_in_bytes)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_get_work_buffer_size, librocfft), rocfft_status, (rocfft_plan, Ptr{Csize_t}), plan, size_in_bytes)
+    @check @ccall librocfft.rocfft_plan_get_work_buffer_size(plan::rocfft_plan,
+                                                             size_in_bytes::Ptr{Csize_t})::rocfft_status
 end
 
 function rocfft_plan_get_print(plan)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_get_print, librocfft), rocfft_status, (rocfft_plan,), plan)
+    @check @ccall librocfft.rocfft_plan_get_print(plan::rocfft_plan)::rocfft_status
 end
 
 function rocfft_plan_description_create(description)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_description_create, librocfft), rocfft_status, (Ptr{rocfft_plan_description},), description)
+    @check @ccall librocfft.rocfft_plan_description_create(description::Ptr{rocfft_plan_description})::rocfft_status
 end
 
 function rocfft_plan_description_destroy(description)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_plan_description_destroy, librocfft), rocfft_status, (rocfft_plan_description,), description)
+    @check @ccall librocfft.rocfft_plan_description_destroy(description::rocfft_plan_description)::rocfft_status
 end
 
 function rocfft_execution_info_create(info)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_execution_info_create, librocfft), rocfft_status, (Ptr{rocfft_execution_info},), info)
+    @check @ccall librocfft.rocfft_execution_info_create(info::Ptr{rocfft_execution_info})::rocfft_status
 end
 
 function rocfft_execution_info_destroy(info)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_execution_info_destroy, librocfft), rocfft_status, (rocfft_execution_info,), info)
+    @check @ccall librocfft.rocfft_execution_info_destroy(info::rocfft_execution_info)::rocfft_status
 end
 
 function rocfft_execution_info_set_work_buffer(info, work_buffer, size_in_bytes)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_execution_info_set_work_buffer, librocfft), rocfft_status, (rocfft_execution_info, Ptr{Cvoid}, Csize_t), info, work_buffer, size_in_bytes)
+    @check @ccall librocfft.rocfft_execution_info_set_work_buffer(info::rocfft_execution_info,
+                                                                  work_buffer::Ptr{Cvoid},
+                                                                  size_in_bytes::Csize_t)::rocfft_status
 end
 
 function rocfft_execution_info_set_stream(info, stream)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_execution_info_set_stream, librocfft), rocfft_status, (rocfft_execution_info, Ptr{Cvoid}), info, stream)
+    @check @ccall librocfft.rocfft_execution_info_set_stream(info::rocfft_execution_info,
+                                                             stream::Ptr{Cvoid})::rocfft_status
 end
 
-function rocfft_execution_info_set_load_callback(info, cb_functions, cb_data, shared_mem_bytes)
+function rocfft_execution_info_set_load_callback(info, cb_functions, cb_data,
+                                                 shared_mem_bytes)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_execution_info_set_load_callback, librocfft), rocfft_status, (rocfft_execution_info, Ptr{Ptr{Cvoid}}, Ptr{Ptr{Cvoid}}, Csize_t), info, cb_functions, cb_data, shared_mem_bytes)
+    @check @ccall librocfft.rocfft_execution_info_set_load_callback(info::rocfft_execution_info,
+                                                                    cb_functions::Ptr{Ptr{Cvoid}},
+                                                                    cb_data::Ptr{Ptr{Cvoid}},
+                                                                    shared_mem_bytes::Csize_t)::rocfft_status
 end
 
-function rocfft_execution_info_set_store_callback(info, cb_functions, cb_data, shared_mem_bytes)
+function rocfft_execution_info_set_store_callback(info, cb_functions, cb_data,
+                                                  shared_mem_bytes)
     AMDGPU.prepare_state()
-    @check ccall((:rocfft_execution_info_set_store_callback, librocfft), rocfft_status, (rocfft_execution_info, Ptr{Ptr{Cvoid}}, Ptr{Ptr{Cvoid}}, Csize_t), info, cb_functions, cb_data, shared_mem_bytes)
+    @check @ccall librocfft.rocfft_execution_info_set_store_callback(info::rocfft_execution_info,
+                                                                     cb_functions::Ptr{Ptr{Cvoid}},
+                                                                     cb_data::Ptr{Ptr{Cvoid}},
+                                                                     shared_mem_bytes::Csize_t)::rocfft_status
 end
 
-const rocfft_version_major = 1
+function rocfft_cache_serialize(buffer, buffer_len_bytes)
+    AMDGPU.prepare_state()
+    @check @ccall librocfft.rocfft_cache_serialize(buffer::Ptr{Ptr{Cvoid}},
+                                                   buffer_len_bytes::Ptr{Csize_t})::rocfft_status
+end
 
-const rocfft_version_minor = 0
+function rocfft_cache_buffer_free(buffer)
+    AMDGPU.prepare_state()
+    @check @ccall librocfft.rocfft_cache_buffer_free(buffer::Ptr{Cvoid})::rocfft_status
+end
 
-const rocfft_version_patch = 27
+function rocfft_cache_deserialize(buffer, buffer_len_bytes)
+    AMDGPU.prepare_state()
+    @check @ccall librocfft.rocfft_cache_deserialize(buffer::Ptr{Cvoid},
+                                                     buffer_len_bytes::Csize_t)::rocfft_status
+end

src/fft/librocfft.jl

@@ -23,8 +23,15 @@ include("util.jl")
 include("wrappers.jl")
 include("fft.jl")
 
-version() = VersionNumber(
-    rocfft_version_major, rocfft_version_minor, rocfft_version_patch)
+function rocfft_get_version_string()
+    vec = zeros(UInt8, 64)
+    rocfft_get_version_string(vec, 64)
+    return unsafe_string(reinterpret(Cstring, pointer(vec)))
+end
+
+function version()
+    VersionNumber(join(split(rocfft_get_version_string(), '.')[1:3], '.'))
+end
 
 const INITIALIZED = Threads.Atomic{Int64}(0)