Manually copy dEQP data files to output directory

scripts/gen_vk_gl_cts_build.py

+#  Copyright 2019 The ANGLE Project Authors. All rights reserved.
+#  Use of this source code is governed by a BSD-style license that can be
+#  found in the LICENSE file.
+#
+#  Code generation for:
+#  - src/tests/deqp_support/BUILD.gn
+#  - src/tests/deqp_data.gni
+#  NOTE: don't run this script directly. Run scripts/run_code_generation.py.
+
+import errno
+import os
+import sys
+import shutil
+
+
+def initDataDirectories(dataDirectories):
+    dataDirectories.append(os.path.join("data", "gles2"))
+    dataDirectories.append(os.path.join("data", "gles3"))
+    dataDirectories.append(os.path.join("data", "gles31"))
+    dataDirectories.append(os.path.join("external", "graphicsfuzz", "data", "gles3"))
+    dataDirectories.append(os.path.join("external", "openglcts", "data", "gles3"))
+
+
+def initPathReplacements(pathReplacements):
+    # The GraphicsFuzz data files need the 'external/graphicsfuzz/' prefix removed
+    pathToReplace = os.path.join("external", "graphicsfuzz", "")  # Include trailing slash
+    pathReplacements[pathToReplace] = ""
+    # The KHR dEQP tests expect a root prefix of "gl_cts" for some reason.
+    pathToReplace = os.path.join("external", "openglcts", "")  # Include trailing slash
+    pathReplacements[pathToReplace] = os.path.join("data", "gl_cts", "")
+
+
+def createBuildGnFile(buildGnPath):
+    # Cleanup the old file
+    if os.path.exists(buildGnPath):
+        os.remove(buildGnPath)
+    # Make the new one
+    return open(buildGnPath, "w+")
+
+
+def createGniFile(gniFilename):
+    # Cleanup the old file
+    if os.path.exists(gniFilename):
+        os.remove(gniFilename)
+    # Make the new one
+    return open(gniFilename, "w+")
+
+
+def writeFileHeader(fileIn):
+    templateFileHeader = """# GENERATED FILE - DO NOT EDIT.
+# Generated by: {script_name}
+#
+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+
+    fileHeader = templateFileHeader.format(script_name=os.path.basename(__file__))
+    fileIn.write(fileHeader)
+
+
+def fixDestinationDirectory(pathReplacements, relativeDirectory):
+    for pathReplacement in pathReplacements:
+        if pathReplacement in relativeDirectory:
+            return relativeDirectory.replace(pathReplacement, pathReplacements[pathReplacement])
+    return relativeDirectory
+
+
+def convertPathToVarName(path):
+    return path.replace(os.sep, "_")
+
+
+def getCMakeLists(deqpSrcDir):
+    cmakeLists = []
+    for root, directories, filenames in os.walk(deqpSrcDir):
+        for filename in filenames:
+            relativeDirectory = os.path.relpath(root, deqpSrcDir)
+            if filename == "CMakeLists.txt":
+                cmakeLists.append(os.path.join(relativeDirectory, filename))
+    return cmakeLists
+
+
+def main():
+    # List of directories containing data files
+    dataDirectories = []
+    # List of directories to exclude from the copy
+    excludedDirectories = [
+        ".git",
+    ]
+    # List of files to exclude from the copy
+    excludedFilenames = [
+        "LICENSE",
+    ]
+    # Dictionary of parts of paths that need to be replaced
+    # Key: Part of path to be replaced
+    # Value: What to replace it with
+    pathReplacements = {}
+    # List of unique relative directories for the copy() command outputs
+    relativeDirectories = []
+    # VK-GL-CTS source directory
+    deqpSourceDirectory = os.path.join("..", "third_party", "VK-GL-CTS", "src")
+    # Tests Directory
+    testsDirectory = os.path.join("..", "src", "tests")
+    # dEQP Support Directory
+    deqpSupportDirectory = "deqp_support"
+    # BUILD.gn file to write to
+    buildGnFilename = "BUILD.gn"
+    # Path to BUILD.gn
+    buildGnPath = os.path.join(testsDirectory, deqpSupportDirectory, buildGnFilename)
+    # dEQP data GNI File to write to
+    dataGniFilename = os.path.join(testsDirectory, deqpSupportDirectory, "deqp_data_autogen.gni")
+
+    # run_code_generation.py parameters.
+    if len(sys.argv) > 1:
+        # All CMakeLists.txt in the dEQP source tree (at the time)
+        cmakeDirs = getCMakeLists(deqpSourceDirectory)
+        inputs = [os.path.join(deqpSourceDirectory, "%s" % dir) for dir in cmakeDirs]
+        outputs = [dataGniFilename, buildGnPath]
+
+        if sys.argv[1] == 'inputs':
+            print(','.join(inputs))
+        elif sys.argv[1] == 'outputs':
+            print(','.join(outputs))
+        else:
+            print('Invalid script parameters')
+            return 1
+        return 0
+
+    deqpSrcDir = os.path.abspath(os.path.join(sys.path[0], deqpSourceDirectory))
+
+    initDataDirectories(dataDirectories)
+    initPathReplacements(pathReplacements)
+
+    dataFiles = []
+    for dataDir in dataDirectories:
+        dataPath = os.path.join(deqpSrcDir, dataDir)
+        for root, directories, filenames in os.walk(dataPath):
+            for filename in filenames:
+                relativeDirectory = os.path.relpath(root, deqpSrcDir)
+                # Skip any excluded directories
+                if any(directory in relativeDirectory for directory in excludedDirectories):
+                    continue
+                # Skip any excluded files
+                if any(excludedFilename in filename for excludedFilename in excludedFilenames):
+                    continue
+                # Record the relative directories and full paths to each data file
+                if relativeDirectory not in relativeDirectories:
+                    relativeDirectories.append(relativeDirectory)
+                dataFiles.append(os.path.join(relativeDirectory, filename))
+
+    dataFiles.sort()
+    relativeDirectories.sort()
+
+    #
+    # BUILD.gn
+    #
+    buildGnFile = createBuildGnFile(buildGnPath)
+    writeFileHeader(buildGnFile)
+    # Definitions
+    buildGnFile.write("deqp_path = \"../../../third_party/VK-GL-CTS/src\"\n")
+    # Create the copy() commands
+    templateFilesToCopy = """    "$deqp_path/{dataFile}",
+"""
+    templateCopyCommand = """
+copy("vk_gl_cts_data_{relDir}") {{
+  sources = [
+    {filesToCopy}
+  ]
+  outputs = [ "$root_gen_dir/vk_gl_cts_data/{destDir}/{{{{source_file_part}}}}" ]
+}}
+"""
+    for relativeDirectory in relativeDirectories:
+        filesToCopy = ""
+        for dataFile in dataFiles:
+            path, filename = os.path.split(dataFile)
+            if relativeDirectory == path:
+                filesToCopy += templateFilesToCopy.format(dataFile=dataFile)
+        copyCommand = ""
+        destDir = fixDestinationDirectory(pathReplacements, relativeDirectory)
+        copyCommand += templateCopyCommand.format(
+            relDir=convertPathToVarName(relativeDirectory),
+            filesToCopy=filesToCopy,
+            destDir=destDir)
+        buildGnFile.write(copyCommand)
+
+    #
+    # .gni
+    #
+    gniFile = createGniFile(dataGniFilename)
+    writeFileHeader(gniFile)
+    # Imports
+    templateImports = """import("deqp.gni")
+"""
+    gniFile.write(templateImports)
+    # Write the lists of data file dependencies
+    templateDataFiles = """  "$root_gen_dir/vk_gl_cts_data/{dataFile}",
+"""
+    templateDataFileDeps = """
+{dataDepName} = [
+{files}]
+"""
+    for dataDirectory in dataDirectories:
+        files = ""
+        for dataFile in dataFiles:
+            if dataDirectory + os.sep in dataFile:
+                files += templateDataFiles.format(
+                    dataFile=fixDestinationDirectory(pathReplacements, dataFile))
+        dataDepName = "angle_deqp_" + convertPathToVarName(dataDirectory)
+        fileDeps = templateDataFileDeps.format(dataDepName=dataDepName, files=files)
+        gniFile.write(fileDeps)
+
+    templateCopyTarget = """  "{deqpSupportDirectory}:vk_gl_cts_data_{relDir}",
+"""
+    templateCopyTargets = """
+angle_deqp_data_copy_targets = [
+{targets}]
+"""
+    targets = ""
+    for relativeDirectory in relativeDirectories:
+        targets += templateCopyTarget.format(
+            deqpSupportDirectory=deqpSupportDirectory,
+            relDir=convertPathToVarName(relativeDirectory))
+    gniFile.write(templateCopyTargets.format(targets=targets))
+
+
+if __name__ == '__main__':
+    sys.exit(main())

scripts/run_code_generation.py

@@ -117,6 +117,8 @@ generators = {
         'src/libANGLE/renderer/metal/gen_mtl_format_table.py',
     'Metal default shaders':
         'src/libANGLE/renderer/metal/shaders/gen_mtl_internal_shaders.py',
+    'GL CTS (dEQP) build files':
+        'scripts/gen_vk_gl_cts_build.py',
 }
 
 

src/tests/BUILD.gn

@@ -503,7 +503,8 @@ if (build_angle_gles1_conform_tests) {
 ###-----------------------------------------------------
 
 if (build_angle_deqp_tests && !is_fuchsia) {
-  import("deqp.gni")
+  import("deqp_support/deqp.gni")
+  import("deqp_support/deqp_data_autogen.gni")
 
   config("angle_deqp_support") {
     include_dirs = deqp_include_dirs
@@ -548,6 +549,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
       "QP_SUPPORT_PNG=1",
       "_HAS_EXCEPTIONS=1",
       "_MBCS",
+      "ANGLE_DEQP_DATA_DIR=\"gen/vk_gl_cts_data/data\"",
     ]
 
     if (is_clang) {
@@ -868,12 +870,23 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     angle_deqp_gtest(target_name) {
       forward_variables_from(invoker, "*")
 
-      defines += [ "ANGLE_DEQP_DATA_DIR=\"data\"" ]
-
       mustpass_name = "${_api}-master.txt"
-      data = [
-        "$deqp_path/data/",
-      ]
+
+      deps = angle_deqp_data_copy_targets
+
+      data = []
+      if (_api == "gles2") {
+        data = angle_deqp_data_gles2
+      } else if (_api == "gles3") {
+        data = angle_deqp_data_gles3
+      } else if (_api == "gles31") {
+        data = angle_deqp_data_gles31
+      } else {
+        # Make sure we include something so that angle_deqp_libtester_main.cpp can find something.
+        data = [
+          "$root_gen_dir/vk_gl_cts_data/data/gles2/shaders/misc.test",
+        ]
+      }
     }
   }
 
@@ -936,38 +949,15 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     include_dirs = [ "$deqp_path/external/vulkancts/framework/vulkan" ]
   }
 
-  # The KHR dEQP tests expect a root prefix of "gl_cts" for some reason.
-  # This means we need an extra copy step to make them happy.
-  copy("angle_deqp_khr_data") {
-    sources = [
-      "$deqp_path/external/openglcts/data/gles3/arrays.test",
-      "$deqp_path/external/openglcts/data/gles3/declarations.test",
-      "$deqp_path/external/openglcts/data/gles3/literal_parsing.test",
-      "$deqp_path/external/openglcts/data/gles3/name_hiding.test",
-      "$deqp_path/external/openglcts/data/gles3/preprocessor.test",
-      "$deqp_path/external/openglcts/data/gles3/switch.test",
-    ]
-
-    outputs = [
-      "$root_out_dir/$angle_data_dir/gl_cts/data/gles3/{{source_file_part}}",
-    ]
-  }
-
   template("angle_deqp_khr_gtest") {
     angle_deqp_gtest(target_name) {
       forward_variables_from(invoker, "*")
       deps = [
         ":angle_deqp_khr_common",
-        ":angle_deqp_khr_data",
       ]
-
-      defines += [ "ANGLE_DEQP_DATA_DIR=\"$angle_data_dir\"" ]
-
+      deps += angle_deqp_data_copy_targets
+      data = angle_deqp_external_openglcts_data_gles3
       mustpass_dir = _khronos_mustpass
-
-      data_deps = [
-        ":angle_deqp_khr_data",
-      ]
     }
   }
 

src/tests/deqp.gni → src/tests/deqp_support/deqp.gni

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../gni/angle.gni")
+import("../../../gni/angle.gni")
 deqp_path = "../../third_party/VK-GL-CTS/src"
 
 deqp_include_dirs = [

src/tests/deqp_support/deqp_gles3_test_expectations.txt

@@ -106,9 +106,6 @@
 // Flaky on Win7 D3D11 NVIDIA
 4070 WIN7 D3D11 NVIDIA : dEQP-GLES3.functional.rasterization.flatshading.triangles = FAIL
 
-// Failing everywhere
-2322 : dEQP-GLES3.functional.shaders.metamorphic.* = FAIL
-
 // Vertex attribute aliasing is not supported on D3D
 3467 D3D9 : dEQP-GLES3.functional.attribute_location.bind_aliasing.cond* = FAIL
 3467 D3D9 : dEQP-GLES3.functional.attribute_location.bind_aliasing.max_cond* = FAIL
@@ -520,6 +517,7 @@
 3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.3 = FAIL
 3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.8 = FAIL
 3308 NEXUS5X GLES : dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.10 = FAIL
+2322 NEXUS5X GLES : dEQP-GLES3.functional.shaders.metamorphic.* = SKIP
 
 // Seems to fail on all desktop GL
 2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8 = FAIL