Anthony Gutierrez has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/29921 )

Change subject: tests: remove deprecated hsail gpu_hello
......................................................................

tests: remove deprecated hsail gpu_hello

Change-Id: I7e15075e7805af732e89c3269fdff9d65a144219
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29921
Reviewed-by: Anthony Gutierrez <anthony.gutier...@amd.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Reviewed-by: Matt Sinclair <mattdsincl...@gmail.com>
Reviewed-by: Xianwei Zhang <xianwei.zh...@amd.com>
Maintainer: Anthony Gutierrez <anthony.gutier...@amd.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
D tests/test-progs/gpu-hello/bin/x86/linux/gpu-hello
D tests/test-progs/gpu-hello/bin/x86/linux/gpu-hello-kernel.asm
D tests/test-progs/gpu-hello/src/gpu-hello-kernel.cl
D tests/test-progs/gpu-hello/src/gpu-hello.cpp
4 files changed, 0 insertions(+), 420 deletions(-)

Approvals:
  Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
  Anthony Gutierrez: Looks good to me, approved; Looks good to me, approved
  Matt Sinclair: Looks good to me, but someone else must approve
  Xianwei Zhang: Looks good to me, approved
  kokoro: Regressions pass



diff --git a/tests/test-progs/gpu-hello/bin/x86/linux/gpu-hello b/tests/test-progs/gpu-hello/bin/x86/linux/gpu-hello
deleted file mode 100755
index de248ee..0000000
--- a/tests/test-progs/gpu-hello/bin/x86/linux/gpu-hello
+++ /dev/null
Binary files differ
diff --git a/tests/test-progs/gpu-hello/bin/x86/linux/gpu-hello-kernel.asm b/tests/test-progs/gpu-hello/bin/x86/linux/gpu-hello-kernel.asm
deleted file mode 100644
index a4ad144..0000000
--- a/tests/test-progs/gpu-hello/bin/x86/linux/gpu-hello-kernel.asm
+++ /dev/null
Binary files differ
diff --git a/tests/test-progs/gpu-hello/src/gpu-hello-kernel.cl b/tests/test-progs/gpu-hello/src/gpu-hello-kernel.cl
deleted file mode 100755
index 496f9b5..0000000
--- a/tests/test-progs/gpu-hello/src/gpu-hello-kernel.cl
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2014-2015 Advanced Micro Devices, Inc.
- * All rights reserved.
- *
- * For use for simulation and test purposes only
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Author: Marc Orr
- */
-
-
-__kernel void read_kernel(size_t code_size,
-                          __global char *code_in,
-                          __global int *key_arr,
-                          __global char *msg_out,
-                          __global int *chars_decoded)
-{
-    size_t gid = get_global_id(0);
-    size_t my_idx = gid % code_size;
-    bool decode = 0;
-    __local atomic_int lcount;
-
-    if (get_local_id(0) == 0) {
-        lcount=0;
-    }
-    barrier(CLK_LOCAL_MEM_FENCE);
-
-    // read code
-    char mycode = code_in[my_idx];
-
-    // decode
-    int my_key = key_arr[my_idx];
-    if (my_key) {
-        decode = 1;
-        for (int n = 0; n < my_key; n++) {
-            mycode++;
-        }
-    }
-
-    // write out msg
-    msg_out[gid] = mycode;
-
-    if (decode) {
-        atomic_fetch_add((atomic_int *)(&lcount), 1);
-    }
-    barrier(CLK_LOCAL_MEM_FENCE);
-
-
-    if (get_local_id(0) == 0) {
-        int _lcount = atomic_load(&lcount);
-        atomic_fetch_add((atomic_int *)chars_decoded, _lcount);
-    }
-}
diff --git a/tests/test-progs/gpu-hello/src/gpu-hello.cpp b/tests/test-progs/gpu-hello/src/gpu-hello.cpp
deleted file mode 100755
index bdff074..0000000
--- a/tests/test-progs/gpu-hello/src/gpu-hello.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 2015 Advanced Micro Devices, Inc.
- * All rights reserved.
- *
- * For use for simulation and test purposes only
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Author: Marc Orr, Brad Beckmann
- */
-
-#include <CL/cl.h>
-#include <malloc.h>
-
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-#include <string>
-
-#ifdef KVM_SWITCH
-#include "m5op.h"
-
-void *m5_mem = (void*)0xffffc90000000000;
-#endif
-
-#define SUCCESS 0
-#define FAILURE 1
-
-// OpenCL datastructures
-cl_context       context;
-cl_device_id     *devices;
-cl_command_queue commandQueue;
-cl_program       program;
-cl_kernel        readKernel;
-
-// Application datastructures
-const int CACHE_LINE_SIZE = 64;
-size_t grid_size = 512;
-size_t work_group_size = 256;
-
-// arguments
-const int code_size = 5;
-const char *code = "hello";
-int *keys;
-char *msg;
-int chars_decoded = 0;
-
-/*
-    Setup data structures for application/algorithm
-*/
-int
-setupDataStructs()
-{
- msg = (char *)memalign(CACHE_LINE_SIZE, (grid_size + 1) * sizeof(char));
-    if (msg == NULL) {
-        printf("%s:%d: error: %s\n", __FILE__, __LINE__,
-               "could not allocate host buffers\n");
-       exit(-1);
-    }
-    msg[grid_size] = '\0';
-
-    keys = (int *)memalign(CACHE_LINE_SIZE, code_size * sizeof(int));
-    keys[0] = 23;
-    keys[1] = 0;
-    keys[2] = 0;
-    keys[3] = 0;
-    keys[4] = 0;
-
-    return SUCCESS;
-}
-
-/* Setup OpenCL data structures */
-int
-setupOpenCL()
-{
-    cl_int status = 0;
-    size_t deviceListSize;
-
-    // 1. Get platform
-    cl_uint numPlatforms;
-    cl_platform_id platform = NULL;
-    status = clGetPlatformIDs(0, NULL, &numPlatforms);
-    if (status != CL_SUCCESS) {
-        printf("Error: Getting Platforms. (clGetPlatformsIDs)\n");
-        return FAILURE;
-    }
-
-    if (numPlatforms > 0) {
-        cl_platform_id *platforms = new cl_platform_id[numPlatforms];
-        status = clGetPlatformIDs(numPlatforms, platforms, NULL);
-        if (status != CL_SUCCESS) {
-            printf("Error: Getting Platform Ids. (clGetPlatformsIDs)\n");
-            return FAILURE;
-        }
-        for (int i = 0; i < numPlatforms; ++i) {
-            char pbuff[100];
-            status = clGetPlatformInfo(platforms[i], CL_PLATFORM_VENDOR,
-                                       sizeof(pbuff), pbuff, NULL);
-            if (status != CL_SUCCESS) {
- printf("Error: Getting Platform Info.(clGetPlatformInfo)\n");
-                return FAILURE;
-            }
-            platform = platforms[i];
-            if (!strcmp(pbuff, "Advanced Micro Devices, Inc.")) {
-                break;
-            }
-        }
-        delete platforms;
-    }
-
-    if (NULL == platform) {
-        printf("NULL platform found so Exiting Application.\n");
-        return FAILURE;
-    }
-
-    // 2. create context from platform
-    cl_context_properties cps[3] =
-        {CL_CONTEXT_PLATFORM, (cl_context_properties)platform, 0};
-    context = clCreateContextFromType(cps, CL_DEVICE_TYPE_GPU, NULL, NULL,
-                                      &status);
-    if (status != CL_SUCCESS) {
-        printf("Error: Creating Context. (clCreateContextFromType)\n");
-        return FAILURE;
-    }
-
-    // 3. Get device info
-    // 3a. Get # of devices
-    status = clGetContextInfo(context, CL_CONTEXT_DEVICES, 0, NULL,
-                              &deviceListSize);
-    if (status != CL_SUCCESS) {
-        printf("Error: Getting Context Info (1st clGetContextInfo)\n");
-        return FAILURE;
-    }
-
-    // 3b. Get the device list data
-    devices = (cl_device_id *)malloc(deviceListSize);
-    if (devices == 0) {
-        printf("Error: No devices found.\n");
-        return FAILURE;
-    }
-    status = clGetContextInfo(context, CL_CONTEXT_DEVICES, deviceListSize,
-                              devices, NULL);
-    if (status != CL_SUCCESS) {
-        printf("Error: Getting Context Info (2nd clGetContextInfo)\n");
-        return FAILURE;
-    }
-
-    // 4. Create command queue for device
-    commandQueue = clCreateCommandQueue(context, devices[0], 0, &status);
-    if (status != CL_SUCCESS) {
-        printf("Creating Command Queue. (clCreateCommandQueue)\n");
-        return FAILURE;
-    }
-
-    const char *source = "dummy text";
-
-    size_t sourceSize[] = {strlen(source)};
-
-    // 5b. Register the kernel with the runtime
-    program = clCreateProgramWithSource(context, 1, &source, sourceSize,
-                                        &status);
-    if (status != CL_SUCCESS) {
-      printf("Error: Loading kernel (clCreateProgramWithSource)\n");
-      return FAILURE;
-    }
-
-    status = clBuildProgram(program, 1, devices, NULL, NULL, NULL);
-    if (status != CL_SUCCESS) {
-        printf("Error: Building kernel (clBuildProgram)\n");
-        return FAILURE;
-    }
-
-    readKernel = clCreateKernel(program, "read_kernel", &status);
-    if (status != CL_SUCCESS) {
- printf("Error: Creating readKernel from program. (clCreateKernel)\n");
-        return FAILURE;
-    }
-
-    return SUCCESS;
-}
-
-
-/* Run kernels */
-int
-runCLKernel(cl_kernel kernel)
-{
-    cl_int   status;
-    cl_event event;
-    size_t globalThreads[1] = {grid_size};
-    size_t localThreads[1] = {work_group_size};
-
-    // 1. Set arguments
-    // 1a. code size
-    size_t code_size = strlen(code);
-    status = clSetKernelArg(kernel, 0, sizeof(size_t), &code_size);
-    if (status != CL_SUCCESS) {
-        printf("Error: Setting kernel argument. (code_size)\n");
-        return FAILURE;
-    }
-
-    // 1b. code
-    status = clSetKernelArg(kernel, 1, sizeof(char *), (void *)&code);
-    if (status != CL_SUCCESS) {
-        printf("Error: Setting kernel argument. (code_in)\n");
-        return FAILURE;
-    }
-
-    // 1c. keys
-    printf("keys = %p, &keys = %p, keys[0] = %d\n", keys, &keys, keys[0]);
-    status = clSetKernelArg(kernel, 2, sizeof(int *), (void *)&keys);
-    if (status != CL_SUCCESS) {
-        printf("Error: Setting kernel argument. (key_arr)\n");
-        return FAILURE;
-    }
-
-    // 1d. msg
-    status = clSetKernelArg(kernel, 3, sizeof(char *), (void *)&msg);
-    if (status != CL_SUCCESS) {
-        printf("Error: Setting kernel argument. (memOut)\n");
-        return FAILURE;
-    }
-
-    // 1e. chars_decoded
-    int *chars_decoded_ptr = &chars_decoded;
-    status = clSetKernelArg(kernel, 4, sizeof(int *),
-                            (void *)&chars_decoded_ptr);
-    if (status != CL_SUCCESS) {
-        printf("Error: Setting kernel argument. (memOut)\n");
-        return FAILURE;
-    }
-
-#ifdef KVM_SWITCH
-    m5_switchcpu();
-#endif
-
-    // 2. Launch kernel
-    status = clEnqueueNDRangeKernel(commandQueue, kernel, 1, NULL,
-                                    globalThreads, localThreads, 0, NULL,
-                                    &event);
-    if (status != CL_SUCCESS) {
-        printf("Error: Enqueue failed. (clEnqueueNDRangeKernel)\n");
-        return FAILURE;
-    }
-
-    // 3. Wait for the kernel
-    status = clWaitForEvents(1, &event);
-    if (status != CL_SUCCESS) {
- printf("Error: Waiting for kernel run to finish. (clWaitForEvents)\n");
-        return FAILURE;
-    }
-
-    // 4. Cleanup
-    status = clReleaseEvent(event);
-    if (status != CL_SUCCESS) {
-        printf("Error: Release event object. (clReleaseEvent)\n");
-        return FAILURE;
-    }
-
-    return SUCCESS;
-}
-
-
-/* Release OpenCL resources (Context, Memory etc.) */
-int
-cleanupCL()
-{
-    cl_int status;
-    status = clReleaseKernel(readKernel);
-    if (status != CL_SUCCESS) {
-        printf("Error: In clReleaseKernel \n");
-        return FAILURE;
-    }
-    status = clReleaseProgram(program);
-    if (status != CL_SUCCESS) {
-        printf("Error: In clReleaseProgram\n");
-        return FAILURE;
-    }
-    status = clReleaseCommandQueue(commandQueue);
-    if (status != CL_SUCCESS) {
-        printf("Error: In clReleaseCommandQueue\n");
-        return FAILURE;
-    }
-    status = clReleaseContext(context);
-    if (status != CL_SUCCESS) {
-        printf("Error: In clReleaseContext\n");
-        return FAILURE;
-    }
-
-    return SUCCESS;
-}
-
-int
-main(int argc, char * argv[])
-{
-    // Initialize Host application
-    if (setupDataStructs() != SUCCESS) {
-        return FAILURE;
-    }
-
-    // Initialize OpenCL resources
-    if (setupOpenCL() != SUCCESS) {
-        return FAILURE;
-    }
-
-    // Run the CL program
-    if (runCLKernel(readKernel) != SUCCESS) {
-        return FAILURE;
-    }
-    printf("the gpu says:\n");
-    printf("%s\n", msg);
-
-    // Releases OpenCL resources
-    if (cleanupCL()!= SUCCESS) {
-        return FAILURE;
-    }
-
-    return SUCCESS;
-}

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29921
To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I7e15075e7805af732e89c3269fdff9d65a144219
Gerrit-Change-Number: 29921
Gerrit-PatchSet: 6
Gerrit-Owner: Anthony Gutierrez <anthony.gutier...@amd.com>
Gerrit-Reviewer: Anthony Gutierrez <anthony.gutier...@amd.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: Tony Gutierrez <anthony.gutier...@amd.com>
Gerrit-Reviewer: Tuan Ta <q...@cornell.edu>
Gerrit-Reviewer: Xianwei Zhang <xianwei.zh...@amd.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

Reply via email to