Page MenuHome
Differential D9020

In Cycles, OpenCL get_device_extension limited
ClosedPublic
Actions

Authored by Matt McClellan (mlmcclel) on Sep 26 2020, 9:53 PM.

Details

Reviewers
Sergey Sharybin (sergey)
Max (maxim_d33)
Brecht Van Lommel (brecht)
Commits
rC9eb544eca497: Fix Cycles OpenCL failing when extension string is long
rB1d985159ad29: Fix Cycles OpenCL failing when extension string is long
Summary

In get_device_extensions in opencl_util.cpp, the extension string is currently limited to 1024 characters. Any devices with an extension string longer that 1024 will be lost. The fix is similar to shat is needed for OpenGL. As an example the current Intel OpenCL device string is longer than 1024 chars.

Diff Detail

Event Timeline

Matt McClellan (mlmcclel) requested review of this revision.Sep 26 2020, 9:53 PM
Matt McClellan (mlmcclel) created this revision.
Matt McClellan (mlmcclel) added reviewers: Sergey Sharybin (sergey), Max (maxim_d33), Brecht Van Lommel (brecht).Sep 28 2020, 6:36 PM
Max (maxim_d33) added a comment.Sep 30 2020, 1:08 PM

it doesnt violate 1.2 spec https://www.khronos.org/registry/OpenCL/sdk/1.2/docs/man/xhtml/clGetDeviceInfo.html and 1024 should be more flexible, agree

intern/cycles/device/opencl/opencl_util.cpp
1200

do we need to delete as we continue referencing pointer by device_extension?

Brecht Van Lommel (brecht) added inline comments.Sep 30 2020, 2:44 PM
intern/cycles/device/opencl/opencl_util.cpp
1187

Use vector<char> instead of new/delete.

1200

The buffer contents is copied into the device_extensions string, so it should be deleted.

Max (maxim_d33) added inline comments.Sep 30 2020, 2:52 PM
intern/cycles/device/opencl/opencl_util.cpp
1200

good point , agree

Matt McClellan (mlmcclel) updated this revision to Diff 29543.Oct 3 2020, 12:40 AM
Matt McClellan (mlmcclel) marked an inline comment as done.

Updated with vector<char> for the buffer.

Matt McClellan (mlmcclel) marked 3 inline comments as done.Oct 3 2020, 12:42 AM
Brecht Van Lommel (brecht) accepted this revision.Oct 5 2020, 2:01 PM
This revision is now accepted and ready to land.Oct 5 2020, 2:01 PM
Closed by commit rB1d985159ad29: Fix Cycles OpenCL failing when extension string is long (authored by Matt McClellan (mlmcclel), committed by Brecht Van Lommel (brecht)). · Explain WhyOct 5 2020, 2:07 PM
This revision was automatically updated to reflect the committed changes.
Brecht Van Lommel (brecht) added a commit: rB1d985159ad29: Fix Cycles OpenCL failing when extension string is long.
Stefan Werner (swerner) added a commit: rC9eb544eca497: Fix Cycles OpenCL failing when extension string is long.Mar 1 2021, 2:18 AM

Revision Contents
Changeset List

PathSize
intern/
cycles/
device/
opencl/
16 lines

Diff 29289

View Options

intern/cycles/device/opencl/opencl_util.cpp

Loading...