Move VkRunner tests to Amber

CTS will use Amber as the shader test engine. Thus this commit does: * move existing VkRunner tests to Amber * remove VkRunner from the CTS source Affects tests: * dEQP-VK.graphicsfuzz.* Components: vulkan VK-GL-CTS issue: 1663 Change-Id: Ie3d17ec6f2eea79b777261f7c022fa7c5d0a965f
KhronosGroup · Mar 29, 2019 · 4698845 · 4698845
1 parent e7a2681
commit 4698845
Show file tree

Hide file tree

Showing 34 changed files with 101 additions and 914 deletions.
diff --git a/AndroidGen.mk b/AndroidGen.mk
@@ -58,6 +58,7 @@ LOCAL_SRC_FILES := \
 	external/vulkancts/framework/vulkan/vkWsiUtil.cpp \
 	external/vulkancts/framework/vulkan/vkYCbCrImageWithMemory.cpp \
 	external/vulkancts/modules/vulkan/amber/vktAmberExampleTests.cpp \
+	external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp \
 	external/vulkancts/modules/vulkan/amber/vktAmberHelper.cpp \
 	external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp \
 	external/vulkancts/modules/vulkan/api/vktApiBufferAndImageAllocationUtil.cpp \
@@ -367,9 +368,6 @@ LOCAL_SRC_FILES := \
 	external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp \
 	external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp \
 	external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp \
-	external/vulkancts/modules/vulkan/vkrunner/vktVkRunnerExampleTests.cpp \
-	external/vulkancts/modules/vulkan/vkrunner/vktVkRunnerGraphicsFuzzTests.cpp \
-	external/vulkancts/modules/vulkan/vkrunner/vktVkRunnerTestCase.cpp \
 	external/vulkancts/modules/vulkan/vktInfoTests.cpp \
 	external/vulkancts/modules/vulkan/vktShaderLibrary.cpp \
 	external/vulkancts/modules/vulkan/vktTestCase.cpp \
@@ -1110,7 +1108,6 @@ LOCAL_C_INCLUDES := \
 	$(deqp_dir)/external/vulkancts/modules/vulkan/texture \
 	$(deqp_dir)/external/vulkancts/modules/vulkan/ubo \
 	$(deqp_dir)/external/vulkancts/modules/vulkan/util \
-	$(deqp_dir)/external/vulkancts/modules/vulkan/vkrunner \
 	$(deqp_dir)/external/vulkancts/modules/vulkan/wsi \
 	$(deqp_dir)/external/vulkancts/modules/vulkan/ycbcr \
 	$(deqp_dir)/framework/common \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,10 +88,6 @@ add_subdirectory(external/glslang)
 # spirv-tools
 add_subdirectory(external/spirv-tools)
 
-# VkRunner
-add_subdirectory(external/vkrunner)
-include_directories(external/vkrunner/src)
-
 # spirv-headers
 set(SPIRV_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/external/spirv-headers/src/include")
 if (NOT EXISTS ${SPIRV_INCLUDE_PATH})

diff --git a/android/cts/master/src/vk-excluded-tests.txt b/android/cts/master/src/vk-excluded-tests.txt
@@ -65,8 +65,5 @@ dEQP-VK.wsi.android.shared_presentable_image.scale_down.*
 # Issue: b/67022169
 dEQP-VK.wsi.android.incremental_present.scale_down.*
 
-# Excluded VkRunner example tests
-dEQP-VK.vkrunner-example.*
-
 # Exclude Amber example tests
 dEQP-VK.amber-example.*
diff --git a/external/fetch_sources.py b/external/fetch_sources.py
@@ -328,11 +328,6 @@ def postExtractLibpng (path):
 		None,
 		"d3752ea20886d2fceb6cecda3c2b146a8f22d214",
 		"spirv-headers"),
-	GitRepo(
-		"https://github.com/Igalia/vkrunner.git",
-		None,
-		"79229ee3662da691240bde7fb6c6578e0e10e3f1",
-		"vkrunner"),
 	GitRepo(
 		"https://github.com/google/amber.git",
 		None,

diff --git a/external/vkrunner/.gitignore b/external/vkrunner/.gitignore
diff --git a/external/vkrunner/CMakeLists.txt b/external/vkrunner/CMakeLists.txt
diff --git a/...aphicsfuzz/continue-and-merge.shader_test → ...ber/graphicsfuzz/continue-and-merge.amber b/...aphicsfuzz/continue-and-merge.shader_test → ...ber/graphicsfuzz/continue-and-merge.amber
diff --git a/...phicsfuzz/control-flow-switch.shader_test → ...er/graphicsfuzz/control-flow-switch.amber b/...phicsfuzz/control-flow-switch.shader_test → ...er/graphicsfuzz/control-flow-switch.amber
diff --git a/...graphicsfuzz/dead-struct-init.shader_test → ...amber/graphicsfuzz/dead-struct-init.amber b/...graphicsfuzz/dead-struct-init.shader_test → ...amber/graphicsfuzz/dead-struct-init.amber
diff --git a/...fuzz/fragcoord-control-flow-2.shader_test → ...aphicsfuzz/fragcoord-control-flow-2.amber b/...fuzz/fragcoord-control-flow-2.shader_test → ...aphicsfuzz/fragcoord-control-flow-2.amber
diff --git a/...csfuzz/fragcoord-control-flow.shader_test → ...graphicsfuzz/fragcoord-control-flow.amber b/...csfuzz/fragcoord-control-flow.shader_test → ...graphicsfuzz/fragcoord-control-flow.amber
diff --git a/...z/mat-array-deep-control-flow.shader_test → ...icsfuzz/mat-array-deep-control-flow.amber b/...z/mat-array-deep-control-flow.shader_test → ...icsfuzz/mat-array-deep-control-flow.amber
diff --git a/...aphicsfuzz/mat-array-distance.shader_test → ...ber/graphicsfuzz/mat-array-distance.amber b/...aphicsfuzz/mat-array-distance.shader_test → ...ber/graphicsfuzz/mat-array-distance.amber
diff --git a/...krunner/graphicsfuzz/pow-vec4.shader_test → .../vulkan/amber/graphicsfuzz/pow-vec4.amber b/...krunner/graphicsfuzz/pow-vec4.shader_test → .../vulkan/amber/graphicsfuzz/pow-vec4.amber
diff --git a/...sfuzz/swizzle-struct-init-min.shader_test → ...raphicsfuzz/swizzle-struct-init-min.amber b/...sfuzz/swizzle-struct-init-min.shader_test → ...raphicsfuzz/swizzle-struct-init-min.amber
diff --git a/...phicsfuzz/while-inside-switch.shader_test → ...er/graphicsfuzz/while-inside-switch.amber b/...phicsfuzz/while-inside-switch.shader_test → ...er/graphicsfuzz/while-inside-switch.amber
diff --git a/external/vulkancts/data/vulkan/vkrunner/example/spirv.shader_test b/external/vulkancts/data/vulkan/vkrunner/example/spirv.shader_test
diff --git a/external/vulkancts/data/vulkan/vkrunner/example/sqrt.shader_test b/external/vulkancts/data/vulkan/vkrunner/example/sqrt.shader_test
diff --git a/external/vulkancts/data/vulkan/vkrunner/example/ubo.shader_test b/external/vulkancts/data/vulkan/vkrunner/example/ubo.shader_test
diff --git a/external/vulkancts/data/vulkan/vkrunner/example/vertex-data.shader_test b/external/vulkancts/data/vulkan/vkrunner/example/vertex-data.shader_test
diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@ -33,7 +33,6 @@ add_subdirectory(ycbcr)
 add_subdirectory(protected_memory)
 add_subdirectory(memory_model)
 add_subdirectory(util)
-add_subdirectory(vkrunner)
 add_subdirectory(amber)
 
 include_directories(
@@ -70,7 +69,6 @@ include_directories(
 	protected_memory
 	memory_model
 	util
-	vkrunner
 	amber
 	)
 
@@ -126,7 +124,6 @@ set(DEQP_VK_LIBS
 	deqp-vk-ycbcr
 	deqp-vk-protected-memory
 	deqp-vk-memory-model
-	deqp-vk-vkrunner
 	deqp-vk-amber
 	)
 

diff --git a/external/vulkancts/modules/vulkan/amber/CMakeLists.txt b/external/vulkancts/modules/vulkan/amber/CMakeLists.txt
@@ -9,6 +9,8 @@ set(DEQP_VK_AMBER_SRCS
 	vktAmberTestCase.cpp
 	vktAmberExampleTests.hpp
 	vktAmberExampleTests.cpp
+	vktAmberGraphicsFuzzTests.hpp
+	vktAmberGraphicsFuzzTests.cpp
 	)
 
 set(DEQP_VK_AMBER_LIBS