Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.1.6

Change-Id: I004160d9169fcb42a928c10d76b5355dd671e5a8

external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 942abbd..904eb57 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -4312,7 +4312,7 @@
 	vector<float>					outputFloats4	(numElements, 0);
 	vector<float>					outputFloats5	(numElements, 0);
 	std::string						codestring		= "ABC";
-	const int						test4Width		= 1024;
+	const int						test4Width		= 512;
 
 	// Build case 5 code string. Each iteration makes the hierarchy more complicated.
 	// 9 iterations with (7, 24) parameters makes the hierarchy 8 deep with about 1500 lines of