Skip to content

Updated acl_context_callback With Additional Log #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2023
Merged

Updated acl_context_callback With Additional Log #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions include/acl_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,22 @@ extern "C" {
#pragma GCC visibility push(protected)
#endif

// Constants
static constexpr const char *ENV_CL_CONTEXT_ALLOW_MULTIPROCESSING_INTELFPGA =
"CL_CONTEXT_ALLOW_MULTIPROCESSING_INTELFPGA";
static constexpr const char *ENV_AOCL_EAGERLY_LOAD_FIRST_BINARY =
"AOCL_EAGERLY_LOAD_FIRST_BINARY";
static constexpr const char *ENV_CL_CONTEXT_COMPILER_MODE_INTELFPGA =
"CL_CONTEXT_COMPILER_MODE_INTELFPGA";
static constexpr const char *ENV_CL_CONTEXT_COMPILER_MODE_ALTERA =
"CL_CONTEXT_COMPILER_MODE_ALTERA";
static constexpr const char *ENV_CL_CONTEXT_PROGRAM_EXE_LIBRARY_ROOT_INTELFPGA =
"CL_CONTEXT_PROGRAM_EXE_LIBRARY_ROOT_INTELFPGA";
static constexpr const char *ENV_CL_CONTEXT_COMPILE_COMMAND_INTELFPGA =
"CL_CONTEXT_COMPILE_COMMAND_INTELFPGA";
static constexpr const char *ENV_ACL_CONTEXT_CALLBACK_DEBUG =
"ACL_CONTEXT_CALLBACK_DEBUG";

// Update data structures in response to async msgs from devices.
// Do this as part of a waiting loop, along with acl_hal_yield().
void acl_update_context(cl_context context);
Expand Down
26 changes: 17 additions & 9 deletions src/acl_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ static cl_context l_create_context(const cl_context_properties *properties,
// Blocking multiple_processing
const char *allow_mp = NULL;
// Check if user wants to disable the check.
allow_mp = acl_getenv("CL_CONTEXT_ALLOW_MULTIPROCESSING_INTELFPGA");
allow_mp = acl_getenv(ENV_CL_CONTEXT_ALLOW_MULTIPROCESSING_INTELFPGA);
if (!allow_mp && platform_owner_pid != 0 &&
platform_owner_pid != acl_get_pid()) {
if (pfn_notify) {
Expand Down Expand Up @@ -565,7 +565,7 @@ static cl_int l_load_properties(cl_context context,

// This one is only overridden with an environment variable.
{
const char *override = acl_getenv("AOCL_EAGERLY_LOAD_FIRST_BINARY");
const char *override = acl_getenv(ENV_AOCL_EAGERLY_LOAD_FIRST_BINARY);
if (override) {
// There was a string.
char *endptr = 0;
Expand All @@ -580,13 +580,15 @@ static cl_int l_load_properties(cl_context context,
{
const char *override = 0;
const char *override_deprecated = 0;
override = acl_getenv("CL_CONTEXT_COMPILER_MODE_INTELFPGA");
override_deprecated = acl_getenv("CL_CONTEXT_COMPILER_MODE_ALTERA");
override = acl_getenv(ENV_CL_CONTEXT_COMPILER_MODE_INTELFPGA);
override_deprecated = acl_getenv(ENV_CL_CONTEXT_COMPILER_MODE_ALTERA);
if (!override && override_deprecated) {
override = override_deprecated;
fprintf(stderr,
"Warning: CL_CONTEXT_COMPILER_MODE_ALTERA has been deprecated. "
"Use CL_CONTEXT_COMPILER_MODE_INTELFPGA instead.\n");
"Warning: %s has been deprecated. "
"Use %s instead.\n",
ENV_CL_CONTEXT_COMPILER_MODE_ALTERA,
ENV_CL_CONTEXT_COMPILER_MODE_INTELFPGA);
}

if (override) {
Expand Down Expand Up @@ -619,8 +621,9 @@ static cl_int l_load_properties(cl_context context,
// If the env var is not set, then use "aocl_program_library" in the
// current directory.
const auto *default_root = acl_getenv(
"CL_CONTEXT_PROGRAM_EXE_LIBRARY_ROOT_INTELFPGA"); // this one is public,
// in cl_ext_intelfpga.h
ENV_CL_CONTEXT_PROGRAM_EXE_LIBRARY_ROOT_INTELFPGA); // this one is public,
// in
// cl_ext_intelfpga.h
if (!default_root) {
default_root = "aocl_program_library";
}
Expand All @@ -632,7 +635,8 @@ static cl_int l_load_properties(cl_context context,
// Get user-specified compile command.
// The default command depends on effective compiler mode, so defer
// until later.
const char *default_cmd = acl_getenv("CL_CONTEXT_COMPILE_COMMAND_INTELFPGA");
const char *default_cmd =
acl_getenv(ENV_CL_CONTEXT_COMPILE_COMMAND_INTELFPGA);
if (default_cmd) {
status = l_update_compile_command(context, default_cmd);
if (status != CL_SUCCESS)
Expand Down Expand Up @@ -1314,6 +1318,10 @@ void acl_context_callback(cl_context context, const std::string errinfo) {
notify_fn(errinfo.c_str(), 0, 0, notify_user_data);
}
}

if (context && acl_getenv(ENV_ACL_CONTEXT_CALLBACK_DEBUG)) {
std::cout << "[acl_context_callback] Error Info: " << errinfo << std::endl;
}
}

// Called when runtime has been waiting for device update for a while
Expand Down