Skip to content
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

Fix segfaults when using CUDA #1397

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −17
Open

Fix segfaults when using CUDA #1397

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions libvmaf/src/feature/cuda/integer_adm_cuda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,11 +1023,11 @@ static int init_fex_cuda(VmafFeatureExtractor *fex, enum VmafPixelFormat pix_fmt
CUmodule adm_cm_module, adm_csf_den_module, adm_csf_module, adm_decouple_module, adm_dwt_module;


CHECK_CUDA(cuModuleLoadData(&adm_dwt_module, src_adm_dwt2_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_csf_module, src_adm_csf_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_decouple_module, src_adm_decouple_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_csf_den_module, src_adm_csf_den_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_cm_module, src_adm_cm_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_dwt_module, adm_dwt2_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_csf_module, adm_csf_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_decouple_module, adm_decouple_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_csf_den_module, adm_csf_den_ptx));
CHECK_CUDA(cuModuleLoadData(&adm_cm_module, adm_cm_ptx));

// Get DWT kernel function pointers check adm_dwt2.cu for __global__ templated kernels
CHECK_CUDA(cuModuleGetFunction(&s->func_dwt_s123_combined_vert_kernel_0_0_int32_t, adm_dwt_module, "dwt_s123_combined_vert_kernel_0_0_int32_t"));
Expand Down
10 changes: 5 additions & 5 deletions libvmaf/src/feature/cuda/integer_adm_cuda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ typedef struct AdmBufferCuda {
void* results_host;
} AdmBufferCuda;

extern unsigned char src_adm_dwt2_ptx[];
extern unsigned char src_adm_csf_den_ptx[];
extern unsigned char src_adm_csf_ptx[];
extern unsigned char src_adm_decouple_ptx[];
extern unsigned char src_adm_cm_ptx[];
extern const unsigned char adm_dwt2_ptx[];
extern const unsigned char adm_csf_den_ptx[];
extern const unsigned char adm_csf_ptx[];
extern const unsigned char adm_decouple_ptx[];
extern const unsigned char adm_cm_ptx[];

#endif /* _FEATURE_ADM_CUDA_H_ */
2 changes: 1 addition & 1 deletion libvmaf/src/feature/cuda/integer_motion_cuda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static int init_fex_cuda(VmafFeatureExtractor *fex, enum VmafPixelFormat pix_fmt
CHECK_CUDA(cuEventCreate(&s->finished, CU_EVENT_DEFAULT));

CUmodule module;
CHECK_CUDA(cuModuleLoadData(&module, src_motion_score_ptx));
CHECK_CUDA(cuModuleLoadData(&module, motion_score_ptx));

CHECK_CUDA(cuModuleGetFunction(&s->funcbpc16, module, "calculate_motion_score_kernel_16bpc"));
CHECK_CUDA(cuModuleGetFunction(&s->funcbpc8, module, "calculate_motion_score_kernel_8bpc"));
Expand Down
2 changes: 1 addition & 1 deletion libvmaf/src/feature/cuda/integer_motion_cuda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
#include "integer_motion.h"
#include "common.h"

extern unsigned char src_motion_score_ptx[];
extern const unsigned char motion_score_ptx[];
#endif /* _FEATURE_MOTION_CUDA_H_ */
2 changes: 1 addition & 1 deletion libvmaf/src/feature/cuda/integer_vif_cuda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ static int init_fex_cuda(VmafFeatureExtractor *fex, enum VmafPixelFormat pix_fmt

// make this static
CUmodule filter1d_module;
CHECK_CUDA(cuModuleLoadData(&filter1d_module, src_filter1d_ptx));
CHECK_CUDA(cuModuleLoadData(&filter1d_module, filter1d_ptx));
CHECK_CUDA(cuModuleGetFunction(&s->func_filter1d_8_vertical_kernel_uint32_t_17_9,
filter1d_module, "filter1d_8_vertical_kernel_uint32_t_17_9"));
CHECK_CUDA(cuModuleGetFunction(&s->func_filter1d_8_horizontal_kernel_2_17_9,
Expand Down
2 changes: 1 addition & 1 deletion libvmaf/src/feature/cuda/integer_vif_cuda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ typedef struct vif_accums {
int64_t den_non_log;
} vif_accums;

extern unsigned char src_filter1d_ptx[];
extern const unsigned char filter1d_ptx[];

#endif /* _FEATURE_VIF_CUDA_H_ */
11 changes: 8 additions & 3 deletions libvmaf/src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,14 +333,19 @@ if is_cuda_enabled

message('ptx_files = @0@'.format(ptx_files))

xxd_exe = find_program('xxd')
# bin2c is distributed along with cuda tools. Use '--padd 0x00' to add a NULL-terminator byte
# to the end of the generated array.
bin2c_exe = find_program('bin2c')
ptx_arrays = []
foreach name, _ptx : ptx_files
t = custom_target('ptx_xxd_@0@'.format(name),
t = custom_target('ptx_bin2c_@0@'.format(name),
build_by_default: true,
output : ['@[email protected]'],
input : _ptx,
command : [xxd_exe, '--include','@INPUT@', '@OUTPUT@'],
capture : true,
command : [bin2c_exe, '--const', '--padd', '0x00',
'--name', '@BASENAME@_ptx', '@INPUT@',
]
)
ptx_arrays += t
endforeach
Expand Down
Loading