blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T77095: fix Cycles performance regression with AMD RX cards 

Apply the workaround only for known problematic drivers. The latest pro driver
appears to work correctly, hopefully the regular driver will as well once it
is updated to the same OpenCL driver version (3075.13).
This commit is contained in:
Brecht Van Lommel 2020-06-26 17:43:32 +02:00 committed by Brecht Van Lommel
parent 9dbe0f9c04
commit 2d8c59ccb9
Notes: blender-bot 2023-02-14 07:31:32 +01:00 
Referenced by issue #77348, Blender LTS: Maintenance Task 2.83
Referenced by issue #77095, Artefacts when rendering with the GPU in Blender 2.90.2 and 2.83 release
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
intern/cycles/device/opencl/device_opencl_impl.cpp
View File

@ -1942,10 +1942,8 @@ void OpenCLDevice::bake(DeviceTask &task, RenderTile &rtile)
clFinish(cqCommandQueue);
}
string OpenCLDevice::kernel_build_options(const string *debug_src)
static bool kernel_build_opencl_2(cl_device_id cdDevice)
{
string build_options = "-cl-no-signed-zeros -cl-mad-enable ";
/* Build with OpenCL 2.0 if available, this improves performance
* with AMD OpenCL drivers on Windows and Linux (legacy drivers).
* Note that OpenCL selects the highest 1.x version by default,
@ -1953,18 +1951,36 @@ string OpenCLDevice::kernel_build_options(const string *debug_src)
int version_major, version_minor;
if (OpenCLInfo::get_device_version(cdDevice, &version_major, &version_minor)) {
if (version_major >= 2) {
/* This appears to trigger a driver bug in Radeon RX cards, so we
* don't use OpenCL 2.0 for those. */
/* This appears to trigger a driver bug in Radeon RX cards with certain
* driver version, so don't use OpenCL 2.0 for those. */
string device_name = OpenCLInfo::get_readable_device_name(cdDevice);
if (!(string_startswith(device_name, "Radeon RX 4") ||
string_startswith(device_name, "Radeon (TM) RX 4") ||
string_startswith(device_name, "Radeon RX 5") ||
string_startswith(device_name, "Radeon (TM) RX 5"))) {
build_options += "-cl-std=CL2.0 ";
if (string_startswith(device_name, "Radeon RX 4") ||
string_startswith(device_name, "Radeon (TM) RX 4") ||
string_startswith(device_name, "Radeon RX 5") ||
string_startswith(device_name, "Radeon (TM) RX 5")) {
char version[256] = "";
int driver_major, driver_minor;
clGetDeviceInfo(cdDevice, CL_DEVICE_VERSION, sizeof(version), &version, NULL);
if (sscanf(version, "OpenCL 2.0 AMD-APP (%d.%d)", &driver_major, &driver_minor) == 2) {
return !(driver_major == 3075 && driver_minor <= 12);
}
}
return true;
}
}
return false;
}
string OpenCLDevice::kernel_build_options(const string *debug_src)
{
string build_options = "-cl-no-signed-zeros -cl-mad-enable ";
if (kernel_build_opencl_2(cdDevice)) {
build_options += "-cl-std=CL2.0 ";
}
if (platform_name == "NVIDIA CUDA") {
build_options +=
"-D__KERNEL_OPENCL_NVIDIA__ "