From ca0d23ce40c544f68ae31fef8c8505aedf4430ab Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 14 Jun 2016 10:04:08 -0700 Subject: [PATCH] pipeline.spec_constant: Remove the data_size tests These tests are invalid. The size of the provided data *must* match the size of the constant being specialized in the SPIR-V. See also: https://gitlab.khronos.org/vulkan/vulkan/issues/345 --- .../pipeline/vktPipelineSpecConstantTests.cpp | 70 ---------------------- .../mustpass/1.0.1/com.drawelements.deqp.vk.xml | 66 -------------------- external/vulkancts/mustpass/1.0.1/vk-default.txt | 18 ------ 3 files changed, 154 deletions(-) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp index f442967..1edc4d1 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSpecConstantTests.cpp @@ -897,75 +897,6 @@ tcu::TestCaseGroup* createBasicSpecializationTests (tcu::TestContext& testCtx, c return testGroup.release(); } -//! Test various input data sizes, e.g. short -> int. -tcu::TestCaseGroup* createDataSizeTests (tcu::TestContext& testCtx, const VkShaderStageFlagBits shaderStage) -{ - de::MovePtr testGroup (new tcu::TestCaseGroup(testCtx, "data_size", "different input data sizes")); - - static const CaseDefinition defs[] = - { - { - "bool", - makeVector(SpecConstant(1u, "layout(constant_id = ${ID}) const bool sc0 = false;", 1, makeValueBool32(true)), - SpecConstant(2u, "layout(constant_id = ${ID}) const bool sc1 = false;", 2, makeValueBool32(true)), - SpecConstant(3u, "layout(constant_id = ${ID}) const bool sc2 = false;", 4, makeValueBool32(true))), - 12, - " bool r0;\n" - " bool r1;\n" - " bool r2;\n", - "", - " sb_out.r0 = sc0;\n" - " sb_out.r1 = sc1;\n" - " sb_out.r2 = sc2;\n", - makeVector(OffsetValue(4, 0, makeValueBool32(true)), - OffsetValue(4, 4, makeValueBool32(true)), - OffsetValue(4, 8, makeValueBool32(true))), - (FeatureFlags)0, - }, - { - "int", - makeVector(SpecConstant(1u, "layout(constant_id = ${ID}) const int sc0 = 0;", 1, makeValueInt32(0xffffff0a)), - SpecConstant(2u, "layout(constant_id = ${ID}) const int sc1 = 0;", 2, makeValueInt32(0xffff0a0b)), - SpecConstant(3u, "layout(constant_id = ${ID}) const int sc2 = 0;", 4, makeValueInt32(0x0a0b0c0d))), - 12, - " int r0;\n" - " int r1;\n" - " int r2;\n", - "", - " sb_out.r0 = sc0;\n" - " sb_out.r1 = sc1;\n" - " sb_out.r2 = sc2;\n", - makeVector(OffsetValue(4, 0, makeValueInt32(0x0a)), - OffsetValue(4, 4, makeValueInt32(0x0a0b)), - OffsetValue(4, 8, makeValueInt32(0x0a0b0c0d))), - (FeatureFlags)0, - }, - { - "uint", - makeVector(SpecConstant(1u, "layout(constant_id = ${ID}) const uint sc0 = 0u;", 1, makeValueUint32(0xffffffa0)), - SpecConstant(2u, "layout(constant_id = ${ID}) const uint sc1 = 0u;", 2, makeValueUint32(0xffffa0b0)), - SpecConstant(3u, "layout(constant_id = ${ID}) const uint sc2 = 0u;", 4, makeValueUint32(0xa0b0c0d0))), - 12, - " uint r0;\n" - " uint r1;\n" - " uint r2;\n", - "", - " sb_out.r0 = sc0;\n" - " sb_out.r1 = sc1;\n" - " sb_out.r2 = sc2;\n", - makeVector(OffsetValue(4, 0, makeValueUint32(0xa0)), - OffsetValue(4, 4, makeValueUint32(0xa0b0)), - OffsetValue(4, 8, makeValueUint32(0xa0b0c0d0))), - (FeatureFlags)0, - }, - }; - - for (int defNdx = 0; defNdx < DE_LENGTH_OF_ARRAY(defs); ++defNdx) - testGroup->addChild(new SpecConstantTest(testCtx, shaderStage, defs[defNdx])); - - return testGroup.release(); -} - //! Specify compute shader work group size through specialization constants. tcu::TestCaseGroup* createWorkGroupSizeTests (tcu::TestContext& testCtx) { @@ -1873,7 +1804,6 @@ tcu::TestCaseGroup* createSpecConstantTests (tcu::TestContext& testCtx) stageGroup->addChild(createDefaultValueTests (testCtx, stage.stage)); stageGroup->addChild(createBasicSpecializationTests(testCtx, stage.stage)); - stageGroup->addChild(createDataSizeTests (testCtx, stage.stage)); stageGroup->addChild(createBuiltInOverrideTests (testCtx, stage.stage)); stageGroup->addChild(createExpressionTests (testCtx, stage.stage)); stageGroup->addChild(createCompositeTests (testCtx, stage.stage)); diff --git a/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml b/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml index 27b3749..a3709d4 100644 --- a/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml +++ b/external/vulkancts/mustpass/1.0.1/com.drawelements.deqp.vk.xml @@ -203156,17 +203156,6 @@ - - - - - - - - - - - @@ -203691,17 +203680,6 @@ - - - - - - - - - - - @@ -204226,17 +204204,6 @@ - - - - - - - - - - - @@ -204761,17 +204728,6 @@ - - - - - - - - - - - @@ -205296,17 +205252,6 @@ - - - - - - - - - - - @@ -205832,17 +205777,6 @@ - - - - - - - - - - - diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt index 5389a06..55f0014 100644 --- a/external/vulkancts/mustpass/1.0.1/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt @@ -62967,9 +62967,6 @@ dEQP-VK.pipeline.spec_constant.graphics.vertex.basic.int dEQP-VK.pipeline.spec_constant.graphics.vertex.basic.uint dEQP-VK.pipeline.spec_constant.graphics.vertex.basic.float dEQP-VK.pipeline.spec_constant.graphics.vertex.basic.double -dEQP-VK.pipeline.spec_constant.graphics.vertex.data_size.bool -dEQP-VK.pipeline.spec_constant.graphics.vertex.data_size.int -dEQP-VK.pipeline.spec_constant.graphics.vertex.data_size.uint dEQP-VK.pipeline.spec_constant.graphics.vertex.builtin.default dEQP-VK.pipeline.spec_constant.graphics.vertex.builtin.specialized dEQP-VK.pipeline.spec_constant.graphics.vertex.expression.spec_const_expression @@ -63138,9 +63135,6 @@ dEQP-VK.pipeline.spec_constant.graphics.fragment.basic.int dEQP-VK.pipeline.spec_constant.graphics.fragment.basic.uint dEQP-VK.pipeline.spec_constant.graphics.fragment.basic.float dEQP-VK.pipeline.spec_constant.graphics.fragment.basic.double -dEQP-VK.pipeline.spec_constant.graphics.fragment.data_size.bool -dEQP-VK.pipeline.spec_constant.graphics.fragment.data_size.int -dEQP-VK.pipeline.spec_constant.graphics.fragment.data_size.uint dEQP-VK.pipeline.spec_constant.graphics.fragment.builtin.default dEQP-VK.pipeline.spec_constant.graphics.fragment.builtin.specialized dEQP-VK.pipeline.spec_constant.graphics.fragment.expression.spec_const_expression @@ -63309,9 +63303,6 @@ dEQP-VK.pipeline.spec_constant.graphics.tess_control.basic.int dEQP-VK.pipeline.spec_constant.graphics.tess_control.basic.uint dEQP-VK.pipeline.spec_constant.graphics.tess_control.basic.float dEQP-VK.pipeline.spec_constant.graphics.tess_control.basic.double -dEQP-VK.pipeline.spec_constant.graphics.tess_control.data_size.bool -dEQP-VK.pipeline.spec_constant.graphics.tess_control.data_size.int -dEQP-VK.pipeline.spec_constant.graphics.tess_control.data_size.uint dEQP-VK.pipeline.spec_constant.graphics.tess_control.builtin.default dEQP-VK.pipeline.spec_constant.graphics.tess_control.builtin.specialized dEQP-VK.pipeline.spec_constant.graphics.tess_control.expression.spec_const_expression @@ -63480,9 +63471,6 @@ dEQP-VK.pipeline.spec_constant.graphics.tess_eval.basic.int dEQP-VK.pipeline.spec_constant.graphics.tess_eval.basic.uint dEQP-VK.pipeline.spec_constant.graphics.tess_eval.basic.float dEQP-VK.pipeline.spec_constant.graphics.tess_eval.basic.double -dEQP-VK.pipeline.spec_constant.graphics.tess_eval.data_size.bool -dEQP-VK.pipeline.spec_constant.graphics.tess_eval.data_size.int -dEQP-VK.pipeline.spec_constant.graphics.tess_eval.data_size.uint dEQP-VK.pipeline.spec_constant.graphics.tess_eval.builtin.default dEQP-VK.pipeline.spec_constant.graphics.tess_eval.builtin.specialized dEQP-VK.pipeline.spec_constant.graphics.tess_eval.expression.spec_const_expression @@ -63651,9 +63639,6 @@ dEQP-VK.pipeline.spec_constant.graphics.geometry.basic.int dEQP-VK.pipeline.spec_constant.graphics.geometry.basic.uint dEQP-VK.pipeline.spec_constant.graphics.geometry.basic.float dEQP-VK.pipeline.spec_constant.graphics.geometry.basic.double -dEQP-VK.pipeline.spec_constant.graphics.geometry.data_size.bool -dEQP-VK.pipeline.spec_constant.graphics.geometry.data_size.int -dEQP-VK.pipeline.spec_constant.graphics.geometry.data_size.uint dEQP-VK.pipeline.spec_constant.graphics.geometry.builtin.default dEQP-VK.pipeline.spec_constant.graphics.geometry.builtin.specialized dEQP-VK.pipeline.spec_constant.graphics.geometry.expression.spec_const_expression @@ -63822,9 +63807,6 @@ dEQP-VK.pipeline.spec_constant.compute.basic.int dEQP-VK.pipeline.spec_constant.compute.basic.uint dEQP-VK.pipeline.spec_constant.compute.basic.float dEQP-VK.pipeline.spec_constant.compute.basic.double -dEQP-VK.pipeline.spec_constant.compute.data_size.bool -dEQP-VK.pipeline.spec_constant.compute.data_size.int -dEQP-VK.pipeline.spec_constant.compute.data_size.uint dEQP-VK.pipeline.spec_constant.compute.builtin.default dEQP-VK.pipeline.spec_constant.compute.builtin.specialized dEQP-VK.pipeline.spec_constant.compute.expression.spec_const_expression -- 2.7.4