Synchronise with Khronos-private Gitlab branch

The maintenance of the conformance tests is moving to Github.

This commit contains all the changes that have been done in
Gitlab since the first public release of the conformance tests.

Signed-off-by: Kevin Petit kevin.petit@arm.com

test_conformance/spirv_new/CMakeLists.txt

@@ -0,0 +1,37 @@
+######################################################################################################
+#Copyright (c) 2016 The Khronos Group Inc. All Rights Reserved.
+#
+#This code is protected by copyright laws and contains material proprietary to the Khronos Group, Inc.
+#This is UNPUBLISHED PROPRIETARY SOURCE CODE that may not be disclosed in whole or in part to
+#third parties, and may not be reproduced, republished, distributed, transmitted, displayed,
+#broadcast or otherwise exploited in any manner without the express prior written permission
+#of Khronos Group. The receipt or possession of this code does not convey any rights to reproduce,
+#disclose, or distribute its contents, or to manufacture, use, or sell anything that it may describe,
+#in whole or in part other than under the terms of the Khronos Adopters Agreement
+#or Khronos Conformance Test Source License Agreement as executed between Khronos and the recipient.
+######################################################################################################
+
+set(MODULE_NAME SPIRV_NEW)
+set(CMAKE_CXX_STANDARD 11)
+
+file(GLOB SPIRV_NEW_SOURCES "*.cpp")
+
+set(TEST_HARNESS_SOURCES
+  ../../test_common/harness/errorHelpers.c
+  ../../test_common/harness/threadTesting.c
+  ../../test_common/harness/testHarness.c
+  ../../test_common/harness/kernelHelpers.c
+  ../../test_common/harness/typeWrappers.cpp
+  ../../test_common/harness/mt19937.c
+  ../../test_common/harness/conversions.c
+  ../../test_common/harness/msvc9.c
+  ../../test_common/harness/rounding_mode.c
+  ../../test_common/harness/os_helpers.cpp
+  ../../test_common/harness/parseParameters.cpp
+  ../../test_conformance/math_brute_force/reference_math.c
+  ../../test_conformance/math_brute_force/Utility.c
+  )
+
+set(${MODULE_NAME}_SOURCES ${SPIRV_NEW_SOURCES} ${TEST_HARNESS_SOURCES})
+
+include(../CMakeCommon.txt)

test_conformance/spirv_new/README.txt

@@ -0,0 +1,13 @@
+test_conformance/spirv_new README
+==================================
+
+The text versions of the spirv files are present in `conformance-tests/test_conformance/spriv_new/spirv_txt`.
+These text files have been used to generate the binaries in `spirv_bin` using the assembler from `spirv-tools`.
+
+The absolute path to `spirv_bin` needs to be passed after `-ILPath` token for the test to find the SPIRV binaries.
+
+An example invocation looks like the following:
+
+```
+./test_conformance/spirv_new/test_conformance_spirv_new -ILPath /home/user/workspace/conformance-tests/test_conformance/spirv_new/spirv_bin/ [other options]
+```

test_conformance/spirv_new/main.cpp

@@ -0,0 +1,173 @@
+/******************************************************************
+Copyright (c) 2016 The Khronos Group Inc. All Rights Reserved.
+
+This code is protected by copyright laws and contains material proprietary to the Khronos Group, Inc.
+This is UNPUBLISHED PROPRIETARY SOURCE CODE that may not be disclosed in whole or in part to
+third parties, and may not be reproduced, republished, distributed, transmitted, displayed,
+broadcast or otherwise exploited in any manner without the express prior written permission
+of Khronos Group. The receipt or possession of this code does not convey any rights to reproduce,
+disclose, or distribute its contents, or to manufacture, use, or sell anything that it may describe,
+in whole or in part other than under the terms of the Khronos Adopters Agreement
+or Khronos Conformance Test Source License Agreement as executed between Khronos and the recipient.
+******************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include "procs.h"
+#if !defined(_WIN32)
+#include <unistd.h>
+#endif
+
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <sstream>
+
+#if defined(_WIN32)
+const std::string slash = "\\";
+#else
+const std::string slash = "/";
+#endif
+
+const std::string spvExt = ".spv";
+const std::string addrWidth = (sizeof(void *) == 4) ? "32" : "64";
+
+std::vector<unsigned char> readBinary(const char *file_name)
+{
+    using namespace std;
+
+    ifstream file(file_name, ios::in | ios::binary | ios::ate);
+
+    std::vector<char> tmpBuffer(0);
+
+    if (file.is_open()) {
+        size_t size = file.tellg();
+        tmpBuffer.resize(size);
+        file.seekg(0, ios::beg);
+        file.read(&tmpBuffer[0], size);
+        file.close();
+    } else {
+        log_error("File %s not found\n", file_name);
+    }
+
+    std::vector<unsigned char> result(tmpBuffer.begin(), tmpBuffer.end());
+
+    return result;
+}
+
+
+std::vector<unsigned char> readSPIRV(const char *file_name)
+{
+    std::string full_name_str = gSpirVPath + slash + file_name + spvExt + addrWidth;
+    return readBinary(full_name_str.c_str());
+}
+
+const char **spirvTestsRegistry::getTestNames()
+{
+    return &testNames[0];
+}
+
+basefn *spirvTestsRegistry::getTests()
+{
+    return &tests[0];
+}
+
+size_t spirvTestsRegistry::getNumTests()
+{
+    return tests.size();
+}
+
+void spirvTestsRegistry::addTestClass(baseTestClass *test, const char *testName)
+{
+    testNames.push_back(testName);
+    testClasses.push_back(test);
+    tests.push_back(test->getFunction());
+}
+
+spirvTestsRegistry& spirvTestsRegistry::getInstance()
+{
+    static spirvTestsRegistry instance;
+    return instance;
+}
+
+static int offline_get_program_with_il(clProgramWrapper &prog,
+                                       const cl_device_id deviceID,
+                                       const cl_context context,
+                                       const char *prog_name)
+{
+    cl_int err = 0;
+    std::string outputTypeStr = "binary";
+    std::string defaultScript = std::string("..") + slash + std::string("spv_to_binary.py");
+    std::string gOfflineCompilerOutput = gSpirVPath + slash + std::string(prog_name);
+    std::string gOfflineCompilerInput = gOfflineCompilerOutput +  spvExt;
+
+    std::string scriptArgs =
+        gOfflineCompilerInput + " "  +
+        gOfflineCompilerOutput + " " +
+        addrWidth + " " +
+        outputTypeStr + " " +
+        "-cl-std=CL2.0";
+
+    std::string scriptToRunString = defaultScript + scriptArgs;
+
+    // execute script
+    log_info("Executing command: %s\n", scriptToRunString.c_str());
+    fflush(stdout);
+    int returnCode = system(scriptToRunString.c_str());
+    if (returnCode != 0) {
+        log_error("Command finished with error: 0x%x\n", returnCode);
+        return CL_COMPILE_PROGRAM_FAILURE;
+    }
+
+    // read output file
+    std::vector<unsigned char> buffer_vec = readBinary(gOfflineCompilerOutput.c_str());
+    size_t file_bytes = buffer_vec.size();
+    if (file_bytes == 0) {
+        log_error("OfflinerCompiler: Failed to open binary file: %s", gOfflineCompilerOutput.c_str());
+        return -1;
+    }
+
+    const unsigned char *buffer = &buffer_vec[0];
+    cl_int status = 0;
+    prog = clCreateProgramWithBinary(context, 1, &deviceID, &file_bytes, &buffer, &status, &err);
+    SPIRV_CHECK_ERROR((err || status), "Failed to create program with clCreateProgramWithBinary");
+    return err;
+}
+
+int get_program_with_il(clProgramWrapper &prog,
+                        const cl_device_id deviceID,
+                        const cl_context context,
+                        const char *prog_name)
+{
+    cl_int err = 0;
+    if (gOfflineCompiler && gOfflineCompilerOutputType == kBinary) {
+        return offline_get_program_with_il(prog, deviceID, context, prog_name);
+    }
+
+    std::vector<unsigned char> buffer_vec = readSPIRV(prog_name);
+
+    int file_bytes = buffer_vec.size();
+    if (file_bytes == 0) {
+        log_error("File %s not found\n", prog_name);
+        return -1;
+    }
+
+    unsigned char *buffer = &buffer_vec[0];
+    prog = clCreateProgramWithIL(context, buffer, file_bytes, &err);
+    SPIRV_CHECK_ERROR(err, "Failed to create program with clCreateProgramWithIL");
+
+    err = clBuildProgram(prog, 1, &deviceID, NULL, NULL, NULL);
+    SPIRV_CHECK_ERROR(err, "Failed to build program");
+
+    return err;
+}
+
+int main(int argc, const char *argv[])
+{
+    gReSeed = 1;
+    return runTestHarness(argc, argv,
+                          spirvTestsRegistry::getInstance().getNumTests(),
+                          spirvTestsRegistry::getInstance().getTests(),
+                          spirvTestsRegistry::getInstance().getTestNames(),
+                          false, false, 0);
+}

test_conformance/spirv_new/procs.h

@@ -0,0 +1,101 @@
+/******************************************************************
+Copyright (c) 2016 The Khronos Group Inc. All Rights Reserved.
+
+This code is protected by copyright laws and contains material proprietary to the Khronos Group, Inc.
+This is UNPUBLISHED PROPRIETARY SOURCE CODE that may not be disclosed in whole or in part to
+third parties, and may not be reproduced, republished, distributed, transmitted, displayed,
+broadcast or otherwise exploited in any manner without the express prior written permission
+of Khronos Group. The receipt or possession of this code does not convey any rights to reproduce,
+disclose, or distribute its contents, or to manufacture, use, or sell anything that it may describe,
+in whole or in part other than under the terms of the Khronos Adopters Agreement
+or Khronos Conformance Test Source License Agreement as executed between Khronos and the recipient.
+******************************************************************/
+
+#pragma once
+
+#include "../../test_common/harness/errorHelpers.h"
+#include "../../test_common/harness/kernelHelpers.h"
+#include "../../test_common/harness/typeWrappers.h"
+#include "../../test_common/harness/conversions.h"
+#include "../../test_common/harness/mt19937.h"
+#include "../../test_common/harness/compat.h"
+#include "../../test_common/harness/testHarness.h"
+#include "../../test_common/harness/parseParameters.h"
+
+#include <vector>
+
+#define SPIRV_CHECK_ERROR(err, fmt, ...) do {               \
+        if (err == CL_SUCCESS) break;                       \
+        log_error("%s(%d): Error %d\n" fmt "\n",            \
+                  __FILE__, __LINE__, err, ##__VA_ARGS__);  \
+        return -1;                                          \
+    } while(0)
+
+
+class baseTestClass
+{
+public:
+    baseTestClass() {}
+    virtual basefn getFunction() = 0;
+};
+
+class spirvTestsRegistry {
+private:
+    std::vector<const char *> testNames;
+    std::vector<baseTestClass *> testClasses;
+    std::vector<basefn> tests;
+
+public:
+
+    static spirvTestsRegistry& getInstance();
+
+    const char **getTestNames();
+
+    basefn *getTests();
+
+    size_t getNumTests();
+
+    void addTestClass(baseTestClass *test, const char *testName);
+    spirvTestsRegistry() {}
+};
+
+template<typename T>
+T* createAndRegister(const char *name)
+{
+    T *testClass = new T();
+    spirvTestsRegistry::getInstance().addTestClass((baseTestClass *)testClass, name);
+    return testClass;
+}
+
+#define TEST_SPIRV_FUNC(name)                           \
+    extern int test_##name(cl_device_id deviceID,       \
+                           cl_context context,          \
+                           cl_command_queue queue,      \
+                           int num_elements);           \
+    class test_##name##_class  : public baseTestClass   \
+    {                                                   \
+    private:                                            \
+        basefn fn;                                      \
+                                                        \
+    public:                                             \
+    test_##name##_class() : fn(test_##name)             \
+        {                                               \
+        }                                               \
+        basefn getFunction()                            \
+        {                                               \
+            return fn;                                  \
+        }                                               \
+    };                                                  \
+    test_##name##_class *var_##name =                   \
+        createAndRegister<test_##name##_class>(#name);  \
+    int test_##name(cl_device_id deviceID,              \
+                    cl_context context,                 \
+                    cl_command_queue queue,             \
+                    int num_elements)
+
+std::vector<unsigned char> readSPIRV(const char *file_name);
+
+int get_program_with_il(clProgramWrapper &prog,
+                        const cl_device_id deviceID,
+                        const cl_context context,
+                        const char *prog_name);