Skip to content

A
angle
Commit 7dfc99e5 by Courtney Goeltzenleuchter Committed by Commit Bot
Options

Vulkan: Update dEQP source for test fixes

Also fix scripts/gen_vk_gl_cts_build.py to always use '/' as file separator. Otherwise, running the script on Windows uses '\' which Linux doesn't like. Test: angle_deqp_gles31_tests --use-angle=swiftshader --gtest_filter=dEQP.GLES31/functional_debug_negative_coverage_get_error_vertex_array_draw_range_elements Bug: angleproject:2324 Bug: angleproject:4234 Change-Id: I3b212e0d0ba97996f1d86f7fc81e58c3b03a9cbb Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1975020 Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 0721cc8b
Showing with 34 additions and 30 deletions
DEPS
...@@ -22,7 +22,7 @@ vars = { ...@@ -22,7 +22,7 @@ vars = {
'chromium_revision': 'e1633af636fa3bc0bf93ccaf5ccc1c9691439703', 'chromium_revision': 'e1633af636fa3bc0bf93ccaf5ccc1c9691439703',
# Current revision of VK-GL-CTS (a.k.a dEQP). # Current revision of VK-GL-CTS (a.k.a dEQP).
'vk_gl_cts_revision': '54ec6f2b1390bf33ea10424dca610f8bcbfefa06', 'vk_gl_cts_revision': 'd99a765d38d35deeb3f27cf30d9d6fe4f183510e',
# Current revision of glslang, the Khronos SPIRV compiler. # Current revision of glslang, the Khronos SPIRV compiler.
'glslang_revision': '6334d594f68c2ba36e3e9bf91aac185ac3875717', 'glslang_revision': '6334d594f68c2ba36e3e9bf91aac185ac3875717',
......
scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
{ {
"scripts/gen_vk_gl_cts_build.py": "scripts/gen_vk_gl_cts_build.py":
"cda74c2ddbb1e1a2e2f97eb1e5ea2569", "51d73f5dda6cd0afac2b241bf95805dd",
"src/tests/deqp_support/BUILD.gn": "src/tests/deqp_support/BUILD.gn":
"aad3f3da4bd365ad06609538cdb615f6", "aac9fd64107cccdd0f3d47d37974ba67",
"src/tests/deqp_support/deqp_data_autogen.gni": "src/tests/deqp_support/deqp_data_autogen.gni":
"30ae29be893ff538b0b4c5119647c132", "3a74e9e404a9b1a4ff1a78d8a640c472",
"third_party/VK-GL-CTS/src/CMakeLists.txt": "third_party/VK-GL-CTS/src/CMakeLists.txt":
"b82006c8b9ee20ce702d410121ac809d", "98f0575b3871b208ce30150dea2081d6",
"third_party/VK-GL-CTS/src/execserver/CMakeLists.txt": "third_party/VK-GL-CTS/src/execserver/CMakeLists.txt":
"38aa187592e6ef9a331fc1ea313fc68d", "38aa187592e6ef9a331fc1ea313fc68d",
"third_party/VK-GL-CTS/src/executor/CMakeLists.txt": "third_party/VK-GL-CTS/src/executor/CMakeLists.txt":
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"third_party/VK-GL-CTS/src/external/openglcts/modules/common/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/openglcts/modules/common/CMakeLists.txt":
"d220542a9e60c717cb3d7211f93440d3", "d220542a9e60c717cb3d7211f93440d3",
"third_party/VK-GL-CTS/src/external/openglcts/modules/common/subgroups/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/openglcts/modules/common/subgroups/CMakeLists.txt":
"e44d868c9076a92806cd27c06da23698", "bf71ce2d9756ccee7833a789737e6481",
"third_party/VK-GL-CTS/src/external/openglcts/modules/gl/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/openglcts/modules/gl/CMakeLists.txt":
"c74b485c5ca3618e38353423255f64a3", "c74b485c5ca3618e38353423255f64a3",
"third_party/VK-GL-CTS/src/external/openglcts/modules/gles2/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/openglcts/modules/gles2/CMakeLists.txt":
...@@ -42,13 +42,13 @@ ...@@ -42,13 +42,13 @@
"third_party/VK-GL-CTS/src/external/spirv-tools/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/spirv-tools/CMakeLists.txt":
"cca8b4b984c40afb9880d177d53623a1", "cca8b4b984c40afb9880d177d53623a1",
"third_party/VK-GL-CTS/src/external/vulkancts/framework/vulkan/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/framework/vulkan/CMakeLists.txt":
"0e8f1b535e3ffa70cc6b52c548da3349", "22633170d1610b91bad7624bd42ceb83",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/CMakeLists.txt":
"05e04841f6512297f49c9d642649f421", "05e04841f6512297f49c9d642649f421",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/amber/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/amber/CMakeLists.txt":
"86cb03a771d5c0a57a6e0dbb305c2aba", "86cb03a771d5c0a57a6e0dbb305c2aba",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/api/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/api/CMakeLists.txt":
"60ff0fa2b6467129cad3057f39a87d79", "2da9d05ef3ba768632d7362d1ffaa143",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/binding_model/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/binding_model/CMakeLists.txt":
"794d2fffb0ac6da4f97bdb97ef241239", "794d2fffb0ac6da4f97bdb97ef241239",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/clipping/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/clipping/CMakeLists.txt":
...@@ -72,29 +72,29 @@ ...@@ -72,29 +72,29 @@
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/geometry/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/geometry/CMakeLists.txt":
"ea6d6d378737311f541c79d03396dc79", "ea6d6d378737311f541c79d03396dc79",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/image/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/image/CMakeLists.txt":
"5ebff6a7a4a87834025784221f232dd2", "0037388ae1cb072440e325e59c141418",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/imageless_framebuffer/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/imageless_framebuffer/CMakeLists.txt":
"9f2167a87844c1c5197d9ccb8863a613", "9f2167a87844c1c5197d9ccb8863a613",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/memory/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/memory/CMakeLists.txt":
"6eebdaaecb4bf9a7fe4ed42994ac873c", "6eebdaaecb4bf9a7fe4ed42994ac873c",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/memory_model/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/memory_model/CMakeLists.txt":
"0a30b3d9793d524ca3b2c01369a0f851", "e799b8ebf89ddd33b5f85d9ce07d45ae",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/multiview/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/multiview/CMakeLists.txt":
"16a341e4f08e85adad6dbf0309883f5b", "16a341e4f08e85adad6dbf0309883f5b",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt":
"c255130ecec0d0cde7e4060ebf3d4ae4", "73a1ff8aa0892ff6f86b46feb33d3da0",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/protected_memory/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/protected_memory/CMakeLists.txt":
"df800ce44dcb03d22810aa1ea988c8d2", "62389a457fa79ff09317b745e0c2f4aa",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/query_pool/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/query_pool/CMakeLists.txt":
"d2ecbb8b56f0f798def13dc990e7f054", "a6087d1fdde5a0f762090b09bce60a26",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt":
"7244cc31e094426b44540c57a017beaa", "7244cc31e094426b44540c57a017beaa",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/renderpass/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/renderpass/CMakeLists.txt":
"43bc3c4ac3832467c494a3c15026dbac", "785c6163f82be15ba011bcb4e4817b8a",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/robustness/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/robustness/CMakeLists.txt":
"d0d524587e3083702cfe79643e9d827b", "d0d524587e3083702cfe79643e9d827b",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/shaderexecutor/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/shaderexecutor/CMakeLists.txt":
"a60baf8dcc867380422d79959048adb2", "05d314091a3ea26095875cd860bd03ca",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/shaderrender/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/shaderrender/CMakeLists.txt":
"0efe14bf15c96997c55df50fc29898c1", "0efe14bf15c96997c55df50fc29898c1",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/sparse_resources/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/sparse_resources/CMakeLists.txt":
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/util/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/util/CMakeLists.txt":
"fd82e3334d71e2b6ad9b126e7a910623", "fd82e3334d71e2b6ad9b126e7a910623",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/wsi/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/wsi/CMakeLists.txt":
"cb5e917d0ece533fb196c154209a7c38", "32a8d4283697d53b99135ab7cda06957",
"third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ycbcr/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ycbcr/CMakeLists.txt":
"1c52b684259622de369aadbb5686a0e4", "1c52b684259622de369aadbb5686a0e4",
"third_party/VK-GL-CTS/src/external/zlib/CMakeLists.txt": "third_party/VK-GL-CTS/src/external/zlib/CMakeLists.txt":
......
scripts/gen_vk_gl_cts_build.py
...@@ -150,7 +150,7 @@ def main(): ...@@ -150,7 +150,7 @@ def main():
dataFiles.append(os.path.join(relativeDirectory, filename)) dataFiles.append(os.path.join(relativeDirectory, filename))
dataFiles.sort() dataFiles.sort()
relativeDirectories.sort() relativeDirectories.sort(key=convertPathToVarName)
# #
# BUILD.gn # BUILD.gn
...@@ -175,13 +175,13 @@ copy("vk_gl_cts_data_{relDir}") {{ ...@@ -175,13 +175,13 @@ copy("vk_gl_cts_data_{relDir}") {{
for dataFile in dataFiles: for dataFile in dataFiles:
path, filename = os.path.split(dataFile) path, filename = os.path.split(dataFile)
if relativeDirectory == path: if relativeDirectory == path:
filesToCopy += templateFilesToCopy.format(dataFile=dataFile) filesToCopy += templateFilesToCopy.format(dataFile=dataFile.replace(os.sep, '/'))
copyCommand = "" copyCommand = ""
destDir = fixDestinationDirectory(pathReplacements, relativeDirectory) destDir = fixDestinationDirectory(pathReplacements, relativeDirectory)
copyCommand += templateCopyCommand.format( copyCommand += templateCopyCommand.format(
relDir=convertPathToVarName(relativeDirectory), relDir=convertPathToVarName(relativeDirectory),
filesToCopy=filesToCopy, filesToCopy=filesToCopy,
destDir=destDir) destDir=destDir.replace(os.sep, '/'))
buildGnFile.write(copyCommand) buildGnFile.write(copyCommand)
# #
...@@ -205,7 +205,8 @@ copy("vk_gl_cts_data_{relDir}") {{ ...@@ -205,7 +205,8 @@ copy("vk_gl_cts_data_{relDir}") {{
for dataFile in dataFiles: for dataFile in dataFiles:
if dataDirectory + os.sep in dataFile: if dataDirectory + os.sep in dataFile:
files += templateDataFiles.format( files += templateDataFiles.format(
dataFile=fixDestinationDirectory(pathReplacements, dataFile)) dataFile=fixDestinationDirectory(pathReplacements, dataFile).replace(
os.sep, '/'))
dataDepName = "angle_deqp_" + convertPathToVarName(dataDirectory) dataDepName = "angle_deqp_" + convertPathToVarName(dataDirectory)
fileDeps = templateDataFileDeps.format(dataDepName=dataDepName, files=files) fileDeps = templateDataFileDeps.format(dataDepName=dataDepName, files=files)
gniFile.write(fileDeps) gniFile.write(fileDeps)
......
src/tests/deqp_support/deqp_data_autogen.gni
...@@ -310,12 +310,12 @@ angle_deqp_data_copy_targets = [ ...@@ -310,12 +310,12 @@ angle_deqp_data_copy_targets = [
"deqp_support:vk_gl_cts_data_data_gles2_data", "deqp_support:vk_gl_cts_data_data_gles2_data",
"deqp_support:vk_gl_cts_data_data_gles2_data_etc1", "deqp_support:vk_gl_cts_data_data_gles2_data_etc1",
"deqp_support:vk_gl_cts_data_data_gles2_shaders", "deqp_support:vk_gl_cts_data_data_gles2_shaders",
"deqp_support:vk_gl_cts_data_data_gles3_data",
"deqp_support:vk_gl_cts_data_data_gles3_data_etc1",
"deqp_support:vk_gl_cts_data_data_gles3_shaders",
"deqp_support:vk_gl_cts_data_data_gles31_data_tessellation", "deqp_support:vk_gl_cts_data_data_gles31_data_tessellation",
"deqp_support:vk_gl_cts_data_data_gles31_shaders_es31", "deqp_support:vk_gl_cts_data_data_gles31_shaders_es31",
"deqp_support:vk_gl_cts_data_data_gles31_shaders_es32", "deqp_support:vk_gl_cts_data_data_gles31_shaders_es32",
"deqp_support:vk_gl_cts_data_data_gles3_data",
"deqp_support:vk_gl_cts_data_data_gles3_data_etc1",
"deqp_support:vk_gl_cts_data_data_gles3_shaders",
"deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz", "deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz",
"deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_bubblesort_flag", "deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_bubblesort_flag",
"deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic", "deqp_support:vk_gl_cts_data_external_graphicsfuzz_data_gles3_graphicsfuzz_synthetic",
......
src/tests/deqp_support/deqp_gles31_test_expectations.txt
...@@ -525,6 +525,13 @@ ...@@ -525,6 +525,13 @@
// Failing with dEQP roll // Failing with dEQP roll
3447 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.all_per_block_buffers.22 = FAIL 3447 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.all_per_block_buffers.22 = FAIL
3447 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.all_per_block_buffers.41 = FAIL 3447 D3D11 : dEQP-GLES31.functional.ssbo.layout.random.all_per_block_buffers.41 = FAIL
4234 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.compute.program_not_active = FAIL
4234 OPENGL : dEQP-GLES31.functional.debug.negative_coverage.get_error.compute.program_not_active = FAIL
4234 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.log.compute.program_not_active = FAIL
4234 OPENGL : dEQP-GLES31.functional.debug.negative_coverage.log.compute.program_not_active = FAIL
4234 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.renderbuffer_storage_multisample = FAIL
4234 D3D11 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.compute.program_not_active = FAIL
4234 OPENGL : dEQP-GLES31.functional.debug.negative_coverage.callbacks.compute.program_not_active = FAIL
// OPENGL Failing Tests // OPENGL Failing Tests
1665 WIN NVIDIA OPENGL : dEQP-GLES31.functional.draw_indirect.negative.command_offset_not_in_buffer_unsigned32_wrap = FAIL 1665 WIN NVIDIA OPENGL : dEQP-GLES31.functional.draw_indirect.negative.command_offset_not_in_buffer_unsigned32_wrap = FAIL
...@@ -554,13 +561,6 @@ ...@@ -554,13 +561,6 @@
3570 : dEQP-GLES31.functional.debug.object_labels.program_pipeline = FAIL 3570 : dEQP-GLES31.functional.debug.object_labels.program_pipeline = FAIL
3570 : dEQP-GLES31.functional.separate_shader.* = FAIL 3570 : dEQP-GLES31.functional.separate_shader.* = FAIL
// The following passes with Vulkan (with warning), but fails otherwise. We'll keep the file simple by expecting it to fail.
2324 : dEQP-GLES31.functional.debug.negative_coverage.callbacks.compute.program_not_active = FAIL
2324 : dEQP-GLES31.functional.debug.negative_coverage.log.compute.program_not_active = FAIL
2324 : dEQP-GLES31.functional.debug.negative_coverage.get_error.compute.program_not_active = FAIL
2324 : dEQP-GLES31.functional.debug.negative_coverage.get_error.vertex_array.draw_range_elements = FAIL
2324 : dEQP-GLES31.functional.debug.negative_coverage.get_error.vertex_array.draw_range_elements_incomplete_primitive = FAIL
// These tests are failing because of compile errors with SSBOs in compute shaders. // These tests are failing because of compile errors with SSBOs in compute shaders.
1442 D3D11 : dEQP-GLES31.functional.stencil_texturing.* = SKIP 1442 D3D11 : dEQP-GLES31.functional.stencil_texturing.* = SKIP
......
src/tests/deqp_support/deqp_gles3_test_expectations.txt
...@@ -174,6 +174,9 @@ ...@@ -174,6 +174,9 @@
1101 WIN D3D11 : dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units = FAIL 1101 WIN D3D11 : dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units = FAIL
1101 WIN D3D11 : dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array = FAIL 1101 WIN D3D11 : dEQP-GLES3.functional.lifetime.attach.deleted_input.buffer_vertex_array = FAIL
// Failed after dEQP roll
4234 WIN D3D11 : dEQP-GLES3.functional.negative_api.buffer.renderbuffer_storage_multisample = FAIL
// Basic line transform feedback tests flaky on Windows. // Basic line transform feedback tests flaky on Windows.
2676 WIN D3D11 : dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.lines.* = FAIL 2676 WIN D3D11 : dEQP-GLES3.functional.transform_feedback.basic_types.interleaved.lines.* = FAIL
2676 WIN D3D11 : dEQP-GLES3.functional.transform_feedback.basic_types.separate.lines.* = FAIL 2676 WIN D3D11 : dEQP-GLES3.functional.transform_feedback.basic_types.separate.lines.* = FAIL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment