Skip to content

A
angle
Commit 8507b105 by John Plate Committed by Commit Bot
Options

Fix CL_EVENT macro

Bug: angleproject:5745 Change-Id: Icbfab0d0bd4b1510b98d5ed746f4d3ddfa5ec36e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2752746 Commit-Queue: John Plate <jplate@google.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 7c02cfee
Showing with 72 additions and 41 deletions
scripts/code_generation_hashes/GL_EGL_entry_points.json
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"scripts/entry_point_packed_gl_enums.json": "scripts/entry_point_packed_gl_enums.json":
"4f7b43863a5e61991bba4010db463679", "4f7b43863a5e61991bba4010db463679",
"scripts/generate_entry_points.py": "scripts/generate_entry_points.py":
"1c1f236f9804be736409ffffc0869662", "776b9fad21f479a16e23beeed97c53f8",
"scripts/gl.xml": "scripts/gl.xml":
"2a73a58a7e26d8676a2c0af6d528cae6", "2a73a58a7e26d8676a2c0af6d528cae6",
"scripts/gl_angle_ext.xml": "scripts/gl_angle_ext.xml":
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
"src/libGLESv2/libGLESv2_with_capture_autogen.def": "src/libGLESv2/libGLESv2_with_capture_autogen.def":
"301a20588e14724b390409c71d5ccfcd", "301a20588e14724b390409c71d5ccfcd",
"src/libOpenCL/entry_points_cl_autogen.cpp": "src/libOpenCL/entry_points_cl_autogen.cpp":
"359093faf2a825d10384d301009ad5b5", "9da7a72f6afcd5af04777103612a3bee",
"src/libOpenCL/entry_points_cl_autogen.h": "src/libOpenCL/entry_points_cl_autogen.h":
"3b4a3094e8fd9082b71915b5bd1e8fee" "3b4a3094e8fd9082b71915b5bd1e8fee"
} }
\ No newline at end of file
scripts/generate_entry_points.py
...@@ -248,8 +248,7 @@ TEMPLATE_EGL_ENTRY_POINT_WITH_RETURN = """\ ...@@ -248,8 +248,7 @@ TEMPLATE_EGL_ENTRY_POINT_WITH_RETURN = """\
TEMPLATE_CL_ENTRY_POINT_NO_RETURN = """\ TEMPLATE_CL_ENTRY_POINT_NO_RETURN = """\
void CL_API_ENTRY CL_{name}({params}) void CL_API_ENTRY CL_{name}({params})
{{ {{
// TODO: CL_EVENT CL_EVENT({name}, "{format_params}"{comma_if_needed}{pass_params});
// CL_EVENT({name}, "{format_params}"{comma_if_needed}{pass_params});
// TODO: {name} // TODO: {name}
}} }}
...@@ -258,8 +257,7 @@ void CL_API_ENTRY CL_{name}({params}) ...@@ -258,8 +257,7 @@ void CL_API_ENTRY CL_{name}({params})
TEMPLATE_CL_ENTRY_POINT_WITH_RETURN = """\ TEMPLATE_CL_ENTRY_POINT_WITH_RETURN = """\
{return_type}CL_API_ENTRY CL_{name}({params}) {return_type}CL_API_ENTRY CL_{name}({params})
{{ {{
// TODO: CL_EVENT CL_EVENT({name}, "{format_params}"{comma_if_needed}{pass_params});
// CL_EVENT({name}, "{format_params}"{comma_if_needed}{pass_params});
// TODO: {name} // TODO: {name}
...@@ -622,18 +620,18 @@ FORMAT_DICT = { ...@@ -622,18 +620,18 @@ FORMAT_DICT = {
"LPGLYPHMETRICSFLOAT": POINTER_FORMAT, "LPGLYPHMETRICSFLOAT": POINTER_FORMAT,
"UINT": "%u", "UINT": "%u",
# CL-specific types # CL-specific types
"size_t": "%u", "size_t": "%zu",
"cl_char": "%d", "cl_char": "%hhd",
"cl_uchar": "%u", "cl_uchar": "%hhu",
"cl_short": "%d", "cl_short": "%hd",
"cl_ushort": "%u", "cl_ushort": "%hu",
"cl_int": "%d", "cl_int": "%d",
"cl_uint": "%u", "cl_uint": "%u",
"cl_long": "%d", "cl_long": "%ld",
"cl_ulong": "%u", "cl_ulong": "%lu",
"cl_half": "%lf", "cl_half": "%hu",
"cl_float": "%lf", "cl_float": "%f",
"cl_double": "%lf", "cl_double": "%f",
"cl_platform_id": POINTER_FORMAT, "cl_platform_id": POINTER_FORMAT,
"cl_device_id": POINTER_FORMAT, "cl_device_id": POINTER_FORMAT,
"cl_context": POINTER_FORMAT, "cl_context": POINTER_FORMAT,
...@@ -642,63 +640,61 @@ FORMAT_DICT = { ...@@ -642,63 +640,61 @@ FORMAT_DICT = {
"cl_program": POINTER_FORMAT, "cl_program": POINTER_FORMAT,
"cl_kernel": POINTER_FORMAT, "cl_kernel": POINTER_FORMAT,
"cl_event": POINTER_FORMAT, "cl_event": POINTER_FORMAT,
"cl_program": POINTER_FORMAT,
"cl_sampler": POINTER_FORMAT, "cl_sampler": POINTER_FORMAT,
"cl_bool": "%u", "cl_bool": "%u",
"cl_bitfield": "%u", "cl_bitfield": "%lu",
"cl_properties": "%u", "cl_properties": "%lu",
"cl_device_type": "%u", "cl_device_type": "%lu",
"cl_platform_info": "%u", "cl_platform_info": "%u",
"cl_device_info": "%u", "cl_device_info": "%u",
"cl_platform_info": "%u", "cl_device_fp_config": "%lu",
"cl_device_fp_config": "%u",
"cl_device_mem_cache_type": "%u", "cl_device_mem_cache_type": "%u",
"cl_device_local_mem_type": "%u", "cl_device_local_mem_type": "%u",
"cl_device_exec_capabilities": "%u", "cl_device_exec_capabilities": "%lu",
"cl_device_svm_capabilities": "%u", "cl_device_svm_capabilities": "%lu",
"cl_command_queue_properties": "%u", "cl_command_queue_properties": "%lu",
"cl_device_partition_property": "%u", "cl_device_partition_property": "%zu",
"cl_device_affinity_domain": "%u", "cl_device_affinity_domain": "%lu",
"cl_context_properties": "%u", "cl_context_properties": "%zu",
"cl_context_info": "%u", "cl_context_info": "%u",
"cl_queue_properties": "%u", "cl_queue_properties": "%lu",
"cl_command_queue_info": "%u", "cl_command_queue_info": "%u",
"cl_channel_order": "%u", "cl_channel_order": "%u",
"cl_channel_type": "%u", "cl_channel_type": "%u",
"cl_mem_flags": "%u", "cl_mem_flags": "%lu",
"cl_svm_mem_flags": "%u", "cl_svm_mem_flags": "%lu",
"cl_mem_object_type": "%u", "cl_mem_object_type": "%u",
"cl_mem_info": "%u", "cl_mem_info": "%u",
"cl_mem_migration_flags": "%u", "cl_mem_migration_flags": "%lu",
"cl_mem_properties": "%lu",
"cl_image_info": "%u", "cl_image_info": "%u",
"cl_buffer_create_type": "%u", "cl_buffer_create_type": "%u",
"cl_addressing_mode": "%u", "cl_addressing_mode": "%u",
"cl_filter_mode": "%u", "cl_filter_mode": "%u",
"cl_sampler_info": "%u", "cl_sampler_info": "%u",
"cl_map_flags": "%u", "cl_map_flags": "%lu",
"cl_pipe_properties": "%u", "cl_pipe_properties": "%zu",
"cl_pipe_info": "%u", "cl_pipe_info": "%u",
"cl_program_info": "%u", "cl_program_info": "%u",
"cl_program_build_info": "%u", "cl_program_build_info": "%u",
"cl_program_binary_type": "%u", "cl_program_binary_type": "%u",
"cl_build_status": "%u", "cl_build_status": "%d",
"cl_kernel_info": "%u", "cl_kernel_info": "%u",
"cl_kernel_arg_info": "%u", "cl_kernel_arg_info": "%u",
"cl_kernel_arg_address_qualifier": "%u", "cl_kernel_arg_address_qualifier": "%u",
"cl_kernel_arg_access_qualifier": "%u", "cl_kernel_arg_access_qualifier": "%u",
"cl_kernel_arg_type_qualifier": "%u", "cl_kernel_arg_type_qualifier": "%lu",
"cl_kernel_work_group_info": "%u", "cl_kernel_work_group_info": "%u",
"cl_kernel_sub_group_info": "%u", "cl_kernel_sub_group_info": "%u",
"cl_event_info": "%u", "cl_event_info": "%u",
"cl_command_type": "%u", "cl_command_type": "%u",
"cl_profiling_info": "%u", "cl_profiling_info": "%u",
"cl_sampler_properties": "%u", "cl_sampler_properties": "%lu",
"cl_kernel_exec_info": "%u", "cl_kernel_exec_info": "%u",
"cl_device_atomic_capabilities": "%u", "cl_device_atomic_capabilities": "%lu",
"cl_device_device_enqueue_capabilities": "%u",
"cl_khronos_vendor_id": "%u", "cl_khronos_vendor_id": "%u",
"cl_mem_properties": "%u",
"cl_version": "%u", "cl_version": "%u",
"cl_device_device_enqueue_capabilities": "%lu",
} }
TEMPLATE_HEADER_INCLUDES = """\ TEMPLATE_HEADER_INCLUDES = """\
...@@ -889,6 +885,7 @@ LIBCL_HEADER_INCLUDES = """\ ...@@ -889,6 +885,7 @@ LIBCL_HEADER_INCLUDES = """\
LIBCL_SOURCE_INCLUDES = """\ LIBCL_SOURCE_INCLUDES = """\
#include "entry_points_cl_autogen.h" #include "entry_points_cl_autogen.h"
#include "entry_points_cl_utils.h"
""" """
TEMPLATE_EVENT_COMMENT = """\ TEMPLATE_EVENT_COMMENT = """\
...@@ -1164,7 +1161,16 @@ def just_the_type(param): ...@@ -1164,7 +1161,16 @@ def just_the_type(param):
def just_the_name(param): def just_the_name(param):
return param[type_name_sep_index(param) + 1:].strip()
def get_name(param_string):
return param_string[type_name_sep_index(param_string) + 1:].strip()
left_paren = param.find("(")
if left_paren == -1:
return get_name(param)
right_paren = param.index(")")
paren_content = param[left_paren + 1:right_paren]
return get_name(paren_content)
def make_param(param_type, param_name): def make_param(param_type, param_name):
......
src/libOpenCL/BUILD.gn
...@@ -37,6 +37,7 @@ angle_shared_library("OpenCL") { ...@@ -37,6 +37,7 @@ angle_shared_library("OpenCL") {
sources = [ sources = [
"entry_points_cl_autogen.cpp", "entry_points_cl_autogen.cpp",
"entry_points_cl_autogen.h", "entry_points_cl_autogen.h",
"entry_points_cl_utils.h",
] ]
deps = [ ":cl_includes" ] deps = [ ":cl_includes" ]
} }
......
src/libOpenCL/entry_points_cl_utils.h 0 → 100644
//
// Copyright 2021 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.
//
// entry_points_cl_utils.h:
// These helpers are used in CL entry point routines.
#ifndef LIBOPENCL_ENTRY_POINTS_CL_UTILS_H_
#define LIBOPENCL_ENTRY_POINTS_CL_UTILS_H_
#include <cinttypes>
#include <cstdio>
#if defined(ANGLE_TRACE_ENABLED)
# define CL_EVENT(entryPoint, ...) \
std::printf("CL " #entryPoint ": " __VA_ARGS__); \
std::printf("\n")
#else
# define CL_EVENT(entryPoint, ...) (void(0))
#endif
#endif // LIBOPENCL_ENTRY_POINTS_CL_UTILS_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment