[Mesa-dev] [PATCH 1/3] Revert "radv: add VK_KHR_shader_atomic_int64 but disable it for now"

[Samuel Pitoiset]

On 4/18/19 8:38 AM, Samuel Pitoiset wrote:
>
> On 4/18/19 8:34 AM, Timothy Arceri wrote:
>> On 18/4/19 4:34 pm, Samuel Pitoiset wrote:
>>>
>>> On 4/18/19 8:16 AM, Timothy Arceri wrote:
>>>> Meant to add this was tested on LLVM 9.
>>>
>>> What do you mean?
>>
>> I meant to say in the commit messages:
>>
>> This first patch in this series caused a piglit regression with 
>> radeonsi NIR on my VEGA64 with LLVM 9.
>>>
>>> Well, there is something really strange with RadeonSI NIR then.
>>
>> ??
> It should just work...

I wonder if https://reviews.llvm.org/D60731 fixed the issue.

Do you have in your tree?

>>
>>>
>>>>
>>>> On 18/4/19 4:15 pm, Timothy Arceri wrote:
>>>>> This reverts commit 9cf55b022dfa43f8fe3163edeb87a1c25ebf5a16.
>>>>>
>>>>> This first patch in this series caused a piglit regression with
>>>>> radeonsi NIR on my VEGA64.
>>>>>
>>>>> tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicAdd-int.shader_test 
>>>>>
>>>>> ---
>>>>>   src/amd/vulkan/radv_device.c      | 10 ----------
>>>>>   src/amd/vulkan/radv_extensions.py |  1 -
>>>>>   src/amd/vulkan/radv_shader.c      |  1 -
>>>>>   3 files changed, 12 deletions(-)
>>>>>
>>>>> diff --git a/src/amd/vulkan/radv_device.c 
>>>>> b/src/amd/vulkan/radv_device.c
>>>>> index 13021a9f2da..1f77dcadb17 100644
>>>>> --- a/src/amd/vulkan/radv_device.c
>>>>> +++ b/src/amd/vulkan/radv_device.c
>>>>> @@ -906,16 +906,6 @@ void radv_GetPhysicalDeviceFeatures2(
>>>>>               features->shaderInt8 = true;
>>>>>               break;
>>>>>           }
>>>>> -        case 
>>>>> VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR: {
>>>>> -            VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *features =
>>>>> - (VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *)ext;
>>>>> -            /* TODO: Enable this once the driver supports 64-bit
>>>>> -             * compare&swap atomic operations.
>>>>> -             */
>>>>> -            features->shaderBufferInt64Atomics = false;
>>>>> -            features->shaderSharedInt64Atomics = false;
>>>>> -            break;
>>>>> -        }
>>>>>           default:
>>>>>               break;
>>>>>           }
>>>>> diff --git a/src/amd/vulkan/radv_extensions.py 
>>>>> b/src/amd/vulkan/radv_extensions.py
>>>>> index 4b12ccc47a0..13fe391e623 100644
>>>>> --- a/src/amd/vulkan/radv_extensions.py
>>>>> +++ b/src/amd/vulkan/radv_extensions.py
>>>>> @@ -81,7 +81,6 @@ EXTENSIONS = [
>>>>>       Extension('VK_KHR_push_descriptor', 1, True),
>>>>>       Extension('VK_KHR_relaxed_block_layout', 1, True),
>>>>>       Extension('VK_KHR_sampler_mirror_clamp_to_edge', 1, True),
>>>>> -    Extension('VK_KHR_shader_atomic_int64', 1, False),
>>>>>       Extension('VK_KHR_shader_draw_parameters', 1, True),
>>>>>       Extension('VK_KHR_shader_float16_int8', 1, True),
>>>>>       Extension('VK_KHR_storage_buffer_storage_class', 1, True),
>>>>> diff --git a/src/amd/vulkan/radv_shader.c 
>>>>> b/src/amd/vulkan/radv_shader.c
>>>>> index c802abb0e08..a9677094772 100644
>>>>> --- a/src/amd/vulkan/radv_shader.c
>>>>> +++ b/src/amd/vulkan/radv_shader.c
>>>>> @@ -235,7 +235,6 @@ radv_shader_compile_to_nir(struct radv_device 
>>>>> *device,
>>>>>                   .int8 = true,
>>>>>                   .int16 = true,
>>>>>                   .int64 = true,
>>>>> -                .int64_atomics = true,
>>>>>                   .multiview = true,
>>>>>                   .physical_storage_buffer_address = true,
>>>>>                   .runtime_descriptor_array = true,
>>>>>