Clean up unused code

Remove redundant state and helper abstractions.

Remove device and window creation logic as it is not used anymore.

Remove test stats tracking, use the harness instead.

Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>

Author: ahesham-arm

test_conformance/d3d10/buffer.cpp

@@ -58,7 +58,7 @@ void SubTestBuffer(
     cl_mem mem = NULL;
     cl_int result = CL_SUCCESS;
 
-    HarnessD3D10_TestBegin("Buffer: Size=%d, BindFlags=%s, Usage=%s, CPUAccess=%s",
+    log_info("Buffer: Size=%d, BindFlags=%s, Usage=%s, CPUAccess=%s",
         props->ByteWidth,
         props->name_BindFlags,
         props->name_Usage,
@@ -288,8 +288,6 @@ void SubTestBuffer(
     {
         clReleaseMemObject(mem);
     }
-
-    HarnessD3D10_TestEnd();
 }
 
 

test_conformance/d3d10/harness.cpp

@@ -13,11 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#define INITGUID
 #include "harness.h"
-#include <vector>
-
-#include <tchar.h>
 
 /*
  * OpenCL state
@@ -45,126 +41,6 @@ HarnessD3D10_Initialize(cl_platform_id platform)
     INITPFN(clEnqueueReleaseD3D10ObjectsKHR);
 }
 
-/*
- * Window management
- */
-
-static IDXGISwapChain*  HarnessD3D10_pSwapChain = NULL;
-static ID3D10Device*    HarnessD3D10_pDevice = NULL;
-static HWND             HarnessD3D10_hWnd = NULL;
-
-static LRESULT WINAPI HarnessD3D10_Proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-    switch(msg)
-    {
-        case WM_KEYDOWN:
-            return 0;
-            break;
-        case WM_DESTROY:
-            HarnessD3D10_hWnd = NULL;
-            PostQuitMessage(0);
-            return 0;
-        case WM_PAINT:
-            ValidateRect(hWnd, NULL);
-            return 0;
-    }
-    return DefWindowProc(hWnd, msg, wParam, lParam);
-}
-
-static void HarnessD3D10_InteractiveLoop()
-{
-    MSG msg;
-    while(PeekMessage(&msg,HarnessD3D10_hWnd,0,0,PM_REMOVE))
-    {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-}
-
-cl_int HarnessD3D10_CreateDevice(IDXGIAdapter* pAdapter, ID3D10Device **ppDevice)
-{
-    HRESULT hr = S_OK;
-    unsigned int cuStatus = 1;
-
-    *ppDevice = NULL;
-
-    // create window
-    static WNDCLASSEX wc =
-    {
-        sizeof(WNDCLASSEX),
-        CS_CLASSDC,
-        HarnessD3D10_Proc,
-        0L,
-        0L,
-        GetModuleHandle(NULL),
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        _T( "cl_khr_d3d10_sharing_conformance" ),
-        NULL
-    };
-    RegisterClassEx(&wc);
-    HarnessD3D10_hWnd = CreateWindow(
-        _T( "cl_khr_d3d10_sharing_conformance" ),
-        _T( "cl_khr_d3d10_sharing_conformance" ),
-        WS_OVERLAPPEDWINDOW,
-        0, 0, 256, 256,
-        NULL,
-        NULL,
-        wc.hInstance,
-        NULL);
-    NonTestRequire(0 != HarnessD3D10_hWnd, "Failed to create window");
-
-    ShowWindow(HarnessD3D10_hWnd,SW_SHOWDEFAULT);
-    UpdateWindow(HarnessD3D10_hWnd);
-
-    RECT rc;
-    GetClientRect(HarnessD3D10_hWnd, &rc);
-    UINT width = rc.right - rc.left;
-    UINT height = rc.bottom - rc.top;
-
-    // Create device and swapchain
-    DXGI_SWAP_CHAIN_DESC sd;
-    ZeroMemory(&sd, sizeof(sd));
-    sd.BufferCount = 1;
-    sd.BufferDesc.Width = width;
-    sd.BufferDesc.Height = height;
-    sd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-    sd.BufferDesc.RefreshRate.Numerator = 60;
-    sd.BufferDesc.RefreshRate.Denominator = 1;
-    sd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
-    sd.OutputWindow = HarnessD3D10_hWnd;
-    sd.SampleDesc.Count = 1;
-    sd.SampleDesc.Quality = 0;
-    sd.Windowed = TRUE;
-    hr = D3D10CreateDeviceAndSwapChain(
-        pAdapter,
-        D3D10_DRIVER_TYPE_HARDWARE,
-        NULL,
-        0,
-        D3D10_SDK_VERSION,
-        &sd,
-        &HarnessD3D10_pSwapChain,
-        &HarnessD3D10_pDevice);
-
-    if (FAILED(hr) ) {
-        return CL_DEVICE_NOT_FOUND;
-    }
-
-    *ppDevice = HarnessD3D10_pDevice;
-    return CL_SUCCESS;
-}
-
-void HarnessD3D10_DestroyDevice()
-{
-    HarnessD3D10_pSwapChain->Release();
-    HarnessD3D10_pDevice->Release();
-
-    if (HarnessD3D10_hWnd) DestroyWindow(HarnessD3D10_hWnd);
-    HarnessD3D10_hWnd = 0;
-}
-
 /*
  *
  * texture formats
@@ -215,76 +91,6 @@ TextureFormat formats[] =
 };
 UINT formatCount = sizeof(formats)/sizeof(formats[0]);
 
-/*
- *
- * Logging and error reporting
- *
- */
-
-static struct
-{
-    cl_int testCount;
-    cl_int passCount;
-
-    cl_int nonTestFailures;
-    cl_int inTest;
-    cl_int currentTestPass;
-
-    char currentTestName[1024];
-} HarnessD3D10_testStats = {0};
-
-void HarnessD3D10_TestBegin(const char* fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    vsprintf(HarnessD3D10_testStats.currentTestName, fmt, ap);
-    va_end(ap);
-
-    TestPrint("[%s] ... ", HarnessD3D10_testStats.currentTestName);
-
-    HarnessD3D10_testStats.inTest = 1;
-    HarnessD3D10_testStats.currentTestPass = 1;
-}
-
-void HarnessD3D10_TestFail()
-{
-    if (HarnessD3D10_testStats.inTest)
-    {
-        HarnessD3D10_testStats.currentTestPass = 0;
-    }
-    else
-    {
-        ++HarnessD3D10_testStats.nonTestFailures;
-    }
-}
-
-void HarnessD3D10_TestEnd()
-{
-    HarnessD3D10_testStats.inTest = 0;
-
-    HarnessD3D10_testStats.testCount += 1;
-    HarnessD3D10_testStats.passCount += HarnessD3D10_testStats.currentTestPass;
-
-    TestPrint("%s\n",
-        HarnessD3D10_testStats.currentTestPass ? "PASSED" : "FAILED");
-}
-
-void HarnessD3D10_TestStats()
-{
-    TestPrint("PASSED %d of %d tests.\n", HarnessD3D10_testStats.passCount, HarnessD3D10_testStats.testCount);
-    if (HarnessD3D10_testStats.testCount > HarnessD3D10_testStats.passCount)
-    {
-        TestPrint("***FAILED***\n");
-        exit(1);
-    }
-    else
-    {
-        TestPrint("&&&& cl_khr_d3d10_sharing test PASSED\n");
-    }
-    exit(0);
-}
-
 /*
  *
  * Helper function

test_conformance/d3d10/harness.h

@@ -13,27 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#ifndef HARNESS_H_
-#define HARNESS_H_
-
-#define _CRT_SECURE_NO_WARNINGS
-
-#if defined (__MINGW32__)
-#include <rpcsal.h>
-typedef unsigned char UINT8;
-#define __out
-#define __in
-#define __inout
-#define __out_bcount_opt(size)
-#define __in_opt
-#define __in_ecount(size)
-#define __in_ecount_opt(size)
-#define __out_opt
-#define __out_ecount(size)
-#define __out_ecount_opt(size)
-#define __in_bcount_opt(size)
-#define __inout_opt
-#endif
+#pragma once
 
 #include "directx_wrapper.hpp"
 
@@ -44,9 +24,6 @@ typedef unsigned char UINT8;
 #include "errorHelpers.h"
 #include "kernelHelpers.h"
 
-// #define log_info(...) printf(__VA_ARGS__)
-// #define log_error(...) printf(__VA_ARGS__)
-
 #define NonTestRequire(x, ...) \
 do \
 { \
@@ -70,7 +47,6 @@ do \
             log_info("ERROR: "); \
             log_error(__VA_ARGS__); \
             log_info("\n"); \
-            HarnessD3D10_TestFail(); \
             goto Cleanup; \
         } \
     } while (0)
@@ -144,14 +120,6 @@ struct Texture3DSize
 };
 
 void HarnessD3D10_Initialize(cl_platform_id platform);
-cl_int HarnessD3D10_CreateDevice(IDXGIAdapter* pAdapter, ID3D10Device **ppDevice);
-void HarnessD3D10_DestroyDevice();
-
-void HarnessD3D10_TestBegin(const char* fmt, ...);
-void HarnessD3D10_TestFail();
-void HarnessD3D10_TestEnd();
-void HarnessD3D10_TestStats();
-
 
 void TestAdapterEnumeration(
     cl_platform_id platform,
@@ -211,5 +179,3 @@ extern clCreateFromD3D10Texture2DKHR_fn   clCreateFromD3D10Texture2DKHR;
 extern clCreateFromD3D10Texture3DKHR_fn   clCreateFromD3D10Texture3DKHR;
 extern clEnqueueAcquireD3D10ObjectsKHR_fn clEnqueueAcquireD3D10ObjectsKHR;
 extern clEnqueueReleaseD3D10ObjectsKHR_fn clEnqueueReleaseD3D10ObjectsKHR;
-
-#endif

test_conformance/d3d10/main.cpp

@@ -262,7 +262,7 @@ void TestAdapterEnumeration(cl_platform_id platform, IDXGIAdapter* pAdapter, ID3
 
      cl_int result;
 
-    HarnessD3D10_TestBegin("cl_device_id Enumeration");
+    log_info("cl_device_id Enumeration");
 
     // get the cl_device_ids for the adapter
     {
@@ -365,8 +365,6 @@ void TestAdapterEnumeration(cl_platform_id platform, IDXGIAdapter* pAdapter, ID3
     }
 
     *num_devices = num_device_devices;
-
-    HarnessD3D10_TestEnd();
 }
 
 bool TestDeviceContextCreate(
@@ -383,7 +381,7 @@ bool TestDeviceContextCreate(
 
     bool succeeded = false;
 
-    HarnessD3D10_TestBegin("Context creation");
+    log_info("Context creation");
 
     cl_context_properties properties[5];
 
@@ -475,6 +473,5 @@ bool TestDeviceContextCreate(
             clReleaseCommandQueue(command_queue);
         }
     }
-    HarnessD3D10_TestEnd();
     return succeeded;
 }

test_conformance/d3d10/misc.cpp

@@ -26,7 +26,7 @@ void SubTestMiscMultipleCreates(
     cl_mem mem[5] = {NULL, NULL, NULL, NULL, NULL};
     cl_int result = CL_SUCCESS;
 
-    HarnessD3D10_TestBegin("Misc: Multiple Creates");
+    log_info("Misc: Multiple Creates");
 
     // create the D3D10 resources
     {
@@ -116,8 +116,6 @@ void SubTestMiscMultipleCreates(
     {
         pTexture->Release();
     }
-
-    HarnessD3D10_TestEnd();
 }
 
 void SubTestMiscAcquireRelease(
@@ -132,7 +130,7 @@ void SubTestMiscAcquireRelease(
     cl_int result = CL_SUCCESS;
     cl_mem mem[2] = {NULL, NULL};
 
-    HarnessD3D10_TestBegin("Misc: Acquire Release");
+    log_info("Misc: Acquire Release");
 
     // create the D3D10 resources
     {
@@ -236,8 +234,6 @@ void SubTestMiscAcquireRelease(
     {
         pTexture->Release();
     }
-
-    HarnessD3D10_TestEnd();
 }
 
 void TestDeviceMisc(

test_conformance/d3d10/texture2d.cpp

@@ -13,7 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#define _CRT_SECURE_NO_WARNINGS
 #include "harness.h"
 
 Texture2DSize texture2DSizes[] =
@@ -168,7 +167,7 @@ void SubTestTexture2D(
 
     cl_int result = CL_SUCCESS;
 
-    HarnessD3D10_TestBegin("2D Texture: Format=%s, Width=%d, Height=%d, MipLevels=%d, ArraySize=%d",
+    log_info("2D Texture: Format=%s, Width=%d, Height=%d, MipLevels=%d, ArraySize=%d",
         format->name_format,
         size->Width,
         size->Height,
@@ -617,8 +616,6 @@ void SubTestTexture2D(
             TestRequire(result == CL_SUCCESS, "clReleaseEvent for event failed.");
         }
     }
-
-    HarnessD3D10_TestEnd();
 }
 
 void TestDeviceTexture2D(