Commit: 2c503d8303299c27b874e11e89a1229c00dfa55d Author: Sergey Sharybin Date: Thu May 21 17:40:04 2015 +0500 Branches: master https://developer.blender.org/rB2c503d8303299c27b874e11e89a1229c00dfa55d
Cycles: Restructure kernel files organization Since the kernel split work we're now having quite a few of new files, majority of which are related on the kernel entry points. Keeping those files in the root kernel folder will eventually make it really hard to follow which files are actual implementation of Cycles kernel. Those files are now moved to kernel/kernels/<device_type>. This way adding extra entry points will be less noisy. It is also nice to have all device-specific files grouped together. Another change is in the way how split kernel invokes logic. Previously all the logic was implemented directly in the .cl files, which makes it a bit tricky to re-use the logic across other devices. Since we'll likely be looking into doing same split work for CUDA devices eventually it makes sense to move logic from .cl files to header files. Those files are stored in kernel/split. This does not mean the header files will not give error messages when tried to be included from other devices and their arguments will likely be changed, but having such separation is a good start anyway. There should be no functional changes. Reviewers: juicyfruit, dingto Differential Revision: https://developer.blender.org/D1314 =================================================================== M SConstruct M intern/cycles/SConscript M intern/cycles/device/device_cuda.cpp M intern/cycles/device/device_opencl.cpp M intern/cycles/kernel/CMakeLists.txt M intern/cycles/kernel/SConscript D intern/cycles/kernel/kernel.cl D intern/cycles/kernel/kernel.cpp D intern/cycles/kernel/kernel.cu D intern/cycles/kernel/kernel_avx.cpp D intern/cycles/kernel/kernel_avx2.cpp D intern/cycles/kernel/kernel_background_buffer_update.cl D intern/cycles/kernel/kernel_data_init.cl D intern/cycles/kernel/kernel_direct_lighting.cl D intern/cycles/kernel/kernel_holdout_emission_blurring_pathtermination_ao.cl D intern/cycles/kernel/kernel_lamp_emission.cl D intern/cycles/kernel/kernel_next_iteration_setup.cl D intern/cycles/kernel/kernel_queue_enqueue.cl D intern/cycles/kernel/kernel_scene_intersect.cl D intern/cycles/kernel/kernel_shader_eval.cl D intern/cycles/kernel/kernel_shadow_blocked.cl D intern/cycles/kernel/kernel_split.h D intern/cycles/kernel/kernel_sse2.cpp D intern/cycles/kernel/kernel_sse3.cpp D intern/cycles/kernel/kernel_sse41.cpp D intern/cycles/kernel/kernel_sum_all_radiance.cl A intern/cycles/kernel/kernels/cpu/kernel.cpp A intern/cycles/kernel/kernels/cpu/kernel_avx.cpp A intern/cycles/kernel/kernels/cpu/kernel_avx2.cpp A intern/cycles/kernel/kernels/cpu/kernel_sse2.cpp A intern/cycles/kernel/kernels/cpu/kernel_sse3.cpp A intern/cycles/kernel/kernels/cpu/kernel_sse41.cpp A intern/cycles/kernel/kernels/cuda/kernel.cu A intern/cycles/kernel/kernels/opencl/kernel.cl A intern/cycles/kernel/kernels/opencl/kernel_background_buffer_update.cl A intern/cycles/kernel/kernels/opencl/kernel_data_init.cl A intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl A intern/cycles/kernel/kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl A intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl A intern/cycles/kernel/kernels/opencl/kernel_next_iteration_setup.cl A intern/cycles/kernel/kernels/opencl/kernel_queue_enqueue.cl A intern/cycles/kernel/kernels/opencl/kernel_scene_intersect.cl A intern/cycles/kernel/kernels/opencl/kernel_shader_eval.cl A intern/cycles/kernel/kernels/opencl/kernel_shadow_blocked.cl A intern/cycles/kernel/kernels/opencl/kernel_sum_all_radiance.cl A intern/cycles/kernel/split/kernel_background_buffer_update.h A intern/cycles/kernel/split/kernel_data_init.h A intern/cycles/kernel/split/kernel_direct_lighting.h A intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h A intern/cycles/kernel/split/kernel_lamp_emission.h A intern/cycles/kernel/split/kernel_next_iteration_setup.h A intern/cycles/kernel/split/kernel_queue_enqueue.h A intern/cycles/kernel/split/kernel_scene_intersect.h A intern/cycles/kernel/split/kernel_shader_eval.h A intern/cycles/kernel/split/kernel_shadow_blocked.h A intern/cycles/kernel/split/kernel_split_common.h A intern/cycles/kernel/split/kernel_sum_all_radiance.h =================================================================== diff --git a/SConstruct b/SConstruct index e1ac00b..d05e689 100644 --- a/SConstruct +++ b/SConstruct @@ -1028,7 +1028,6 @@ if env['OURPLATFORM']!='darwin': dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel') source=os.listdir('intern/cycles/kernel') if '__pycache__' in source: source.remove('__pycache__') - source.remove('kernel.cpp') source.remove('CMakeLists.txt') source.remove('SConscript') source.remove('svm') @@ -1036,6 +1035,7 @@ if env['OURPLATFORM']!='darwin': source.remove('geom') source.remove('shaders') source.remove('osl') + source.remove('split') source=['intern/cycles/kernel/'+s for s in source] source.append('intern/cycles/util/util_atomic.h') source.append('intern/cycles/util/util_color.h') @@ -1063,6 +1063,12 @@ if env['OURPLATFORM']!='darwin': if '__pycache__' in source: source.remove('__pycache__') source=['intern/cycles/kernel/geom/'+s for s in source] scriptinstall.append(env.Install(dir=dir,source=source)) + # split + dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'split') + source=os.listdir('intern/cycles/kernel/split') + if '__pycache__' in source: source.remove('__pycache__') + source=['intern/cycles/kernel/split/'+s for s in source] + scriptinstall.append(env.Install(dir=dir,source=source)) # licenses dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license') diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 75bb5bb..99df8c2 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -34,12 +34,8 @@ cycles.Depends('../../source/blender/makesrna/intern/RNA_blender_cpp.h', 'makesr sources = cycles.Glob('bvh/*.cpp') + cycles.Glob('device/*.cpp') + cycles.Glob('kernel/*.cpp') + cycles.Glob('render/*.cpp') + cycles.Glob('subd/*.cpp') + cycles.Glob('util/*.cpp') + cycles.Glob('blender/*.cpp') +sources.append(path.join('kernel', 'kernels', 'cpu', 'kernel.cpp')) sources.remove(path.join('util', 'util_view.cpp')) -sources.remove(path.join('kernel', 'kernel_sse2.cpp')) -sources.remove(path.join('kernel', 'kernel_sse3.cpp')) -sources.remove(path.join('kernel', 'kernel_sse41.cpp')) -sources.remove(path.join('kernel', 'kernel_avx.cpp')) -sources.remove(path.join('kernel', 'kernel_avx2.cpp')) incs = [] defs = [] @@ -146,7 +142,7 @@ for kernel_type in kernel_flags.keys(): defs.append('WITH_KERNEL_' + kernel_type.upper()) for kernel_type in kernel_flags.keys(): - kernel_source = path.join('kernel', 'kernel_' + kernel_type + '.cpp') + kernel_source = path.join('kernel', 'kernels', 'cpu', 'kernel_' + kernel_type + '.cpp') kernel_cxxflags = Split(env['CXXFLAGS']) kernel_cxxflags.append(kernel_flags[kernel_type].split()) kernel_defs = defs[:] diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index f050153..8d69046 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -266,7 +266,7 @@ public: printf("CUDA version %d.%d detected, build may succeed but only CUDA 6.5 is officially supported.\n", cuda_version/10, cuda_version%10); /* compile */ - string kernel = path_join(kernel_path, "kernel.cu"); + string kernel = path_join(kernel_path, path_join("kernels", path_join("cuda", "kernel.cu"))); string include = kernel_path; const int machine = system_cpu_bits(); diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 88c2a2f..d209340 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -748,7 +748,7 @@ public: } else { - string init_kernel_source = "#include \"kernel.cl\" // " + kernel_md5 + "\n"; + string init_kernel_source = "#include \"kernels/opencl/kernel.cl\" // " + kernel_md5 + "\n"; /* if does not exist or loading binary failed, compile kernel */ if(!compile_kernel(kernel_path, init_kernel_source, "", &cpProgram, debug_src)) @@ -1322,7 +1322,7 @@ public: /* Kernel loaded from binary, nothing to do. */ } else { - string init_kernel_source = "#include \"kernel.cl\" // " + + string init_kernel_source = "#include \"kernels/opencl/kernel.cl\" // " + kernel_md5 + "\n"; /* If does not exist or loading binary failed, compile kernel. */ if(!compile_kernel(kernel_path, @@ -1996,7 +1996,7 @@ public: #define GLUE(a, b) a ## b #define LOAD_KERNEL(name) \ do { \ - kernel_init_source = "#include \"kernel_" #name ".cl\" // " + \ + kernel_init_source = "#include \"kernels/opencl/kernel_" #name ".cl\" // " + \ kernel_md5 + "\n"; \ device_md5 = device_md5_hash(build_options); \ clbin = string_printf("cycles_kernel_%s_%s_" #name ".clbin", \ diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 3e16c4b..89dd354 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -12,20 +12,20 @@ set(INC_SYS ) set(SRC - kernel.cpp - kernel.cl - kernel_data_init.cl - kernel_queue_enqueue.cl - kernel_scene_intersect.cl - kernel_lamp_emission.cl - kernel_background_buffer_update.cl - kernel_shader_eval.cl - kernel_holdout_emission_blurring_pathtermination_ao.cl - kernel_direct_lighting.cl - kernel_shadow_blocked.cl - kernel_next_iteration_setup.cl - kernel_sum_all_radiance.cl - kernel.cu + kernels/cpu/kernel.cpp + kernels/opencl/kernel.cl + kernels/opencl/kernel_data_init.cl + kernels/opencl/kernel_queue_enqueue.cl + kernels/opencl/kernel_scene_intersect.cl + kernels/opencl/kernel_lamp_emission.cl + kernels/opencl/kernel_background_buffer_update.cl + kernels/opencl/kernel_shader_eval.cl + kernels/opencl/kernel_holdout_emission_blurring_pathtermination_ao.cl + kernels/opencl/kernel_direct_lighting.cl + kernels/opencl/kernel_shadow_blocked.cl + kernels/opencl/kernel_next_iteration_setup.cl + kernels/opencl/kernel_sum_all_radiance.cl + kernels/cuda/kernel.cu ) set(SRC_HEADERS @@ -57,7 +57,6 @@ set(SRC_HEADERS kernel_shader.h kernel_shaderdata_vars.h kernel_shadow.h - kernel_split.h kernel_subsurface.h kernel_textures.h kernel_types.h @@ -162,6 +161,22 @@ set(SRC_UTIL_HEADERS ../util/util_transform.h ../util/util_types.h ) + +set(SRC_SPLIT_HEADERS + split/kernel_background_buffer_update.h + split/kernel_data_init.h + split/kernel_direct_lighting.h + split/kernel_holdout_emission_blurring_pathtermination_ao.h + split/kernel_lamp_emission.h + split/kernel_next_iteration_setup.h + split/kernel_queue_enqueue.h + split/kernel_scene_intersect.h + split/kernel_shader_eval.h + split/kernel_shadow_blocked.h + split/kernel_split_common.h + split/kernel_sum_all_radiance.h +) + # CUDA module if(WITH_CYCLES_CUDA_BINARIES) @@ -187,7 +202,7 @@ if(WITH_CYCLES_CUDA_BINARIES) endif() # build for each arch - set(cuda_sources kernel.cu ${SRC_HEADERS} ${SRC_SVM_HEADERS} ${SRC_GEOM_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_UTIL_HEADERS}) + set(cuda_sources kernels/cuda/kernel.cu ${SRC_HEADERS} ${SRC_SVM_HEADERS} ${SRC_GEOM_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_UTIL_HEADERS}) set(cuda_cubins) macro(CYCLES_CUDA_KERNEL_ADD arch experimental) @@ -213,7 +228,7 @@ if(WITH_CYCLES_CUDA_BINARIES) COMMAND ${CUDA_NVCC_EXECUTABLE} -arch=${arch} -m${CUDA_BITS} - --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu + --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernels/cuda/kernel.cu -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v" ${cuda_arch_flags} @@ -261,28 +276,28 @@ include_directories(SYSTEM ${INC_SYS}) if(CXX_HAS_SSE) list(APPEND SRC - kernel_sse2.cpp - kernel_sse3.cpp - kernel_sse41.cpp + kernels/cpu/kernel_sse2.cpp + kernels/cpu/kernel_sse3.cpp + kernels/cpu/kernel_sse41.cpp ) - set_source_files_properties(kernel_sse2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE2_KERNEL_FLAGS}") - set_source_files_properties(kernel_sse3.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE3_KERNEL_FLAGS}") - set_source_files_properties(kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}") + set_source_files_properties(kernels/cpu/kernel_sse2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE2_KERNEL_FLAGS}") + set_source_files_properties(kernels/cpu/kernel_sse3.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE3_KERNEL_FLAGS}") + set_source_files_properties(kernels/cpu/kernel_sse41.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_SSE41_KERNEL_FLAGS}") endif() if(CXX_HAS_AVX) list(APPEND SRC - kernel_avx.cpp + kernels/cpu/kernel_avx.cpp ) - set_source_files_properties(kernel_avx.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}") + set_source_files_properties(kernels/cpu/kernel_avx.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}") endif() if(CXX_HAS_AVX2) list(APPEND SRC - kernel_avx2.cpp + kernels/cpu/kernel_avx2.cpp ) - set_source_files_properties(kernel_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}") + set_source_files_properties(kernels/cpu/kernel_avx2.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}") endif() add_library(cycles_kernel ${SRC} ${SRC_HEADERS} ${SRC_CLOSURE_HEADERS} ${SRC_SVM_HEADERS} ${SRC_GEOM_HEADERS}) @@ -301,22 +316,23 @@ endif() #add_custom_target(cycles_kernel_preprocess ALL DEPENDS ${KERNEL_PREPROCESSED}) #delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${KERNEL_PREPROCESSED}" ${CYCLES_INSTALL_PATH}/kernel) -delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel.cl" ${CYCLES_INSTALL_PATH}/kernel) -delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_data_init.cl" ${CYCLES_INSTALL_PATH}/kernel) -delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_queue_enqueue.cl" ${CYCLES_INSTALL_PATH}/kernel) -delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_scene_intersect.cl" ${CYCLES_INSTALL_PATH}/kernel) -delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "kernel_lamp_emission.cl" ${CYCLES_INSTALL_PATH}/kern @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
