This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH 4/7] Use the enum OPENCL_FUNCTIONS as indices of opencl_function_names.
- From: Sebastian Pop <sebpop at gmail dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: gcc-graphite at googlegroups dot com, amonakov at ispras dot ru, kayrick at ispras dot ru, Sebastian Pop <sebpop at gmail dot com>
- Date: Mon, 27 Dec 2010 23:57:59 -0600
- Subject: [PATCH 4/7] Use the enum OPENCL_FUNCTIONS as indices of opencl_function_names.
- References: <1293515882-16339-1-git-send-email-sebpop@gmail.com>
2010-12-27 Sebastian Pop <sebastian.pop@amd.com>
* Makefile.in (graphite-opencl.o): Depends on
graphite-opencl-functions.def.
* graphite-opencl-functions.def: New.
* graphite-opencl.c (enum OPENCL_FUNCTIONS): Read data from
graphite-opencl-functions.def.
(opencl_function_names): Same.
(opencl_create_function_decl): Use the enum OPENCL_FUNCTIONS
as indices of opencl_function_names.
---
gcc/ChangeLog.graphite | 11 ++++
gcc/Makefile.in | 2 +-
gcc/graphite-opencl-functions.def | 41 +++++++++++++
gcc/graphite-opencl.c | 114 +++++++++++++++++--------------------
4 files changed, 105 insertions(+), 63 deletions(-)
create mode 100644 gcc/graphite-opencl-functions.def
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index aea2188..198b1c1 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,5 +1,16 @@
2010-12-27 Sebastian Pop <sebastian.pop@amd.com>
+ * Makefile.in (graphite-opencl.o): Depends on
+ graphite-opencl-functions.def.
+ * graphite-opencl-functions.def: New.
+ * graphite-opencl.c (enum OPENCL_FUNCTIONS): Read data from
+ graphite-opencl-functions.def.
+ (opencl_function_names): Same.
+ (opencl_create_function_decl): Use the enum OPENCL_FUNCTIONS
+ as indices of opencl_function_names.
+
+2010-12-27 Sebastian Pop <sebastian.pop@amd.com>
+
* graphite-opencl-codegen.c: Fix formatting.
* graphite-opencl-meta-clast.c: Same.
* graphite-opencl.c: Same.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6106331..a7fb853 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2711,7 +2711,7 @@ graphite-opencl-meta-clast.o: graphite-opencl-meta-clast.c $(CONFIG_H) \
pointer-set.h value-prof.h graphite-ppl.h sese.h \
graphite-scop-detection.h graphite-clast-to-gimple.h graphite-poly.h \
graphite-dependences.h
-graphite-opencl.o: graphite-opencl.c $(CONFIG_H) \
+graphite-opencl.o: graphite-opencl.c graphite-opencl-functions.def $(CONFIG_H) \
$(SYSTEM_H) coretypes.h $(TM_H) \
$(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TOPLEV_H) \
$(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \
diff --git a/gcc/graphite-opencl-functions.def b/gcc/graphite-opencl-functions.def
new file mode 100644
index 0000000..9c5ca5d
--- /dev/null
+++ b/gcc/graphite-opencl-functions.def
@@ -0,0 +1,41 @@
+/* This file contains the OpenCL function definitions used in Graphite-OpenCL.
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>. */
+
+/* The format of this file is
+ DEFOPENCLCODE(code, "function_name"). */
+
+DEFOPENCLCODE (CREATE_CONTEXT_FROM_TYPE, "clCreateContextFromType")
+DEFOPENCLCODE (GET_CONTEXT_INFO, "clGetContextInfo")
+DEFOPENCLCODE (CREATE_COMMAND_QUEUE, "clCreateCommandQueue")
+DEFOPENCLCODE (CREATE_PROGRAM_WITH_SOURCE, "clCreateProgramWithSource")
+DEFOPENCLCODE (BUILD_PROGRAM, "clBuildProgram")
+DEFOPENCLCODE (CREATE_KERNEL, "clCreateKernel")
+DEFOPENCLCODE (CREATE_BUFFER, "clCreateBuffer")
+DEFOPENCLCODE (SET_KERNEL_ARG, "clSetKernelArg")
+DEFOPENCLCODE (ENQUEUE_ND_RANGE_KERNEL, "clEnqueueNDRangeKernel")
+DEFOPENCLCODE (ENQUEUE_READ_BUFFER, "clEnqueueReadBuffer")
+DEFOPENCLCODE (ENQUEUE_WRITE_BUFFER, "clEnqueueWriteBuffer")
+DEFOPENCLCODE (RELEASE_MEMORY_OBJ, "clReleaseMemObject")
+DEFOPENCLCODE (RELEASE_CONTEXT, "clReleaseContext")
+DEFOPENCLCODE (RELEASE_COMMAND_QUEUE, "clReleaseCommandQueue")
+DEFOPENCLCODE (RELEASE_PROGRAM, "clReleaseProgram")
+DEFOPENCLCODE (RELEASE_KERNEL, "clReleaseKernel")
+DEFOPENCLCODE (GET_PLATFORM_IDS, "clGetPlatformIDs")
+DEFOPENCLCODE (WAIT_FOR_EVENTS, "clWaitForEvents")
diff --git a/gcc/graphite-opencl.c b/gcc/graphite-opencl.c
index b0ef21d..e6af69d 100644
--- a/gcc/graphite-opencl.c
+++ b/gcc/graphite-opencl.c
@@ -86,31 +86,6 @@
#include "dyn-string.h"
#include "graphite-opencl.h"
-/* Enum for all OpenCL functions used in GRAPHITE-OpenCL. */
-
-enum OPENCL_FUNCTIONS
- {
- STATIC_INIT = 0,
- CREATE_CONTEXT_FROM_TYPE = 1,
- GET_CONTEXT_INFO = 2,
- CREATE_COMMAND_QUEUE = 3,
- CREATE_PROGRAM_WITH_SOURCE = 4,
- BUILD_PROGRAM = 5,
- CREATE_KERNEL = 6,
- CREATE_BUFFER = 7,
- SET_KERNEL_ARG = 8,
- ENQUEUE_ND_RANGE_KERNEL = 9,
- ENQUEUE_READ_BUFFER = 10,
- ENQUEUE_WRITE_BUFFER = 11,
- RELEASE_MEMORY_OBJ = 12,
- RELEASE_CONTEXT = 13,
- RELEASE_COMMAND_QUEUE = 14,
- RELEASE_PROGRAM = 15,
- RELEASE_KERNEL = 16,
- GET_PLATFORM_IDS = 17,
- WAIT_FOR_EVENTS = 18
- };
-
/* Data structure to be used in data_reference_p to opencl_data hash
table. */
struct map_ref_to_data_def
@@ -312,30 +287,27 @@ opencl_verify (void)
#define CL_MEM_READ_ONLY (1 << 2)
#define CL_TRUE 1
-/* Names of all OpenCL functions, used in GRAPHITE-OpenCL. */
+#define DEFOPENCLCODE(CODE, FN_NAME) CODE,
+
+/* Enum for all OpenCL functions used in GRAPHITE-OpenCL. */
+enum OPENCL_FUNCTIONS
+ {
+#include "graphite-opencl-functions.def"
+ STATIC_INIT
+ };
+#undef DEFOPENCLCODE
+
+#define DEFOPENCLCODE(CODE, FN_NAME) FN_NAME,
+
+/* Names of all OpenCL functions, used in GRAPHITE-OpenCL. */
static const char *opencl_function_names[] =
{
- "clCreateContextFromType",
- "clGetContextInfo",
- "clCreateCommandQueue",
- "clCreateProgramWithSource",
- "clBuildProgram",
- "clCreateKernel",
- "clCreateBuffer",
- "clSetKernelArg",
- "clEnqueueNDRangeKernel",
- "clEnqueueReadBuffer",
- "clEnqueueWriteBuffer",
- "clReleaseMemObject",
- "clReleaseContext",
- "clReleaseCommandQueue",
- "clReleaseProgram",
- "clReleaseKernel",
- "clGetPlatformIDs",
- "clWaitForEvents"
+#include "graphite-opencl-functions.def"
};
+#undef DEFOPENCLCODE
+
#endif
/* Variable, which holds OpenCL context. */
@@ -746,7 +718,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
integer_ptr_type_node,
NULL_TREE);
create_context_from_type_decl
- = build_fn_decl (opencl_function_names[0], function_type);
+ = build_fn_decl (opencl_function_names[CREATE_CONTEXT_FROM_TYPE],
+ function_type);
/* | cl_int clGetContextInfo (cl_context context,
| cl_context_info param_name,
@@ -762,7 +735,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
size_t_ptr,
NULL_TREE);
get_context_info_decl
- = build_fn_decl (opencl_function_names[1], function_type);
+ = build_fn_decl (opencl_function_names[GET_CONTEXT_INFO],
+ function_type);
/* | cl_command_queue
| clCreateCommandQueue (cl_context context,
@@ -777,7 +751,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
integer_ptr_type_node,
NULL_TREE);
create_command_queue_decl
- = build_fn_decl (opencl_function_names[2], function_type);
+ = build_fn_decl (opencl_function_names[CREATE_COMMAND_QUEUE],
+ function_type);
/* | cl_program clCreateProgramWithSource (cl_context context,
| cl_uint count,
@@ -793,7 +768,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
integer_ptr_type_node,
NULL_TREE);
create_program_with_source_decl
- = build_fn_decl (opencl_function_names[3], function_type);
+ = build_fn_decl (opencl_function_names[CREATE_PROGRAM_WITH_SOURCE],
+ function_type);
/* | cl_int
| clBuildProgram (cl_program program,
@@ -812,7 +788,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
ptr_type_node,
NULL_TREE);
build_program_decl
- = build_fn_decl (opencl_function_names[4], function_type);
+ = build_fn_decl (opencl_function_names[BUILD_PROGRAM],
+ function_type);
/* | cl_kernel clCreateKernel (cl_program program,
| const char *kernel_name,
@@ -825,7 +802,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
NULL_TREE);
create_kernel_decl
- = build_fn_decl (opencl_function_names[5], function_type);
+ = build_fn_decl (opencl_function_names[CREATE_KERNEL],
+ function_type);
/* | cl_mem clCreateBuffer (cl_context context,
| cl_mem_flags flags,
@@ -842,7 +820,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
integer_ptr_type_node,
NULL_TREE);
create_buffer_decl
- = build_fn_decl (opencl_function_names[6], function_type);
+ = build_fn_decl (opencl_function_names[CREATE_BUFFER],
+ function_type);
/* | cl_int clSetKernelArg (cl_kernel kernel,
@@ -858,7 +837,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
const_ptr_type_node,
NULL_TREE);
set_kernel_arg_decl
- = build_fn_decl (opencl_function_names[7], function_type);
+ = build_fn_decl (opencl_function_names[SET_KERNEL_ARG],
+ function_type);
/* | cl_int clEnqueueNDRangeKernel (cl_command_queue command_queue,
| cl_kernel kernel,
@@ -884,7 +864,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
NULL_TREE);
enqueue_nd_range_kernel_decl
- = build_fn_decl (opencl_function_names[8], function_type);
+ = build_fn_decl (opencl_function_names[ENQUEUE_ND_RANGE_KERNEL],
+ function_type);
/* | cl_int clEnqueueReadBuffer (cl_command_queue command_queue,
| cl_mem buffer,
@@ -910,7 +891,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
NULL_TREE);
enqueue_read_buffer_decl
- = build_fn_decl (opencl_function_names[9], function_type);
+ = build_fn_decl (opencl_function_names[ENQUEUE_READ_BUFFER],
+ function_type);
/* | cl_int clEnqueueWriteBuffer (cl_command_queue command_queue,
| cl_mem buffer,
@@ -936,7 +918,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
NULL_TREE);
enqueue_write_buffer_decl
- = build_fn_decl (opencl_function_names[10], function_type);
+ = build_fn_decl (opencl_function_names[ENQUEUE_WRITE_BUFFER],
+ function_type);
/* cl_int clReleaseMemObject (cl_mem memobj) */
@@ -945,7 +928,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
= build_function_type_list (integer_type_node, cl_mem, NULL_TREE);
release_memory_obj_decl
- = build_fn_decl (opencl_function_names[11], function_type);
+ = build_fn_decl (opencl_function_names[RELEASE_MEMORY_OBJ],
+ function_type);
/* cl_int clReleaseContext (cl_context context) */
@@ -954,7 +938,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
NULL_TREE);
release_context_decl
- = build_fn_decl (opencl_function_names[12], function_type);
+ = build_fn_decl (opencl_function_names[RELEASE_CONTEXT],
+ function_type);
/* cl_int clReleaseCommandQueue (cl_command_queue command_queue) */
function_type
@@ -962,7 +947,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
NULL_TREE);
release_command_queue_decl
- = build_fn_decl (opencl_function_names[13], function_type);
+ = build_fn_decl (opencl_function_names[RELEASE_COMMAND_QUEUE],
+ function_type);
/* cl_int clReleaseProgram (cl_program program) */
function_type
@@ -970,14 +956,16 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
NULL_TREE);
release_program_decl
- = build_fn_decl (opencl_function_names[14], function_type);
+ = build_fn_decl (opencl_function_names[RELEASE_PROGRAM],
+ function_type);
/* cl_int clReleaseKernel (cl_kernel kernel) */
function_type
= build_function_type_list (integer_type_node, cl_kernel, NULL_TREE);
release_kernel_decl
- = build_fn_decl (opencl_function_names[15], function_type);
+ = build_fn_decl (opencl_function_names[RELEASE_KERNEL],
+ function_type);
/* | cl_int clGetPlatformIDs (cl_uint num_entries,
| cl_platform_id *platforms,
@@ -991,7 +979,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
build_pointer_type (unsigned_type_node),
NULL_TREE);
get_platform_ids_decl
- = build_fn_decl (opencl_function_names [16], function_type);
+ = build_fn_decl (opencl_function_names [GET_PLATFORM_IDS],
+ function_type);
/* | cl_int clWaitForEvents (cl_uint num_events,
@@ -1004,7 +993,8 @@ opencl_create_function_decl (enum OPENCL_FUNCTIONS id)
NULL_TREE);
get_wait_for_events_decl
- = build_fn_decl (opencl_function_names [17], function_type);
+ = build_fn_decl (opencl_function_names [WAIT_FOR_EVENTS],
+ function_type);
return NULL_TREE;
}
--
1.7.1