anv: Expose CS workgroup sizes based on a maximum of 64 threads

Otherwise, we'll hit asserts in brw_compile_cs.

Fixes: cf12faef61 "intel/compiler: Restrict cs_threads to 64"
Closes: #2835
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4746>
(cherry picked from commit 81ac741f89)
This commit is contained in:
Jason Ekstrand 2020-04-24 19:07:44 -05:00 committed by Dylan Baker
parent 002f718dfa
commit 4072515d57
2 changed files with 3 additions and 2 deletions

View file

@ -229,7 +229,7 @@
"description": "anv: Expose CS workgroup sizes based on a maximum of 64 threads",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "cf12faef614ab7cd9996410f1d161558a3853936"
},

View file

@ -1422,7 +1422,8 @@ void anv_GetPhysicalDeviceProperties(
pdevice->has_bindless_images && pdevice->has_a64_buffer_access
? UINT32_MAX : MAX_BINDING_TABLE_SIZE - MAX_RTS - 1;
const uint32_t max_workgroup_size = 32 * devinfo->max_cs_threads;
/* Limit max_threads to 64 for the GPGPU_WALKER command */
const uint32_t max_workgroup_size = 32 * MIN2(64, devinfo->max_cs_threads);
VkSampleCountFlags sample_counts =
isl_device_get_sample_counts(&pdevice->isl_dev);