df26a50d0d
Merge liboffloadmic from upstream liboffloadmic/ * Makefile.am (myo_inc_dir): Remove. (toolexeclib_LTLIBRARIES): Remove libmyo-client.la and libmyo-service.la. (liboffloadmic_cppflags): Remove -DMYO_SUPPORT. (liboffloadmic_host_la_SOURCES): Remove offload_myo_host.cpp. (liboffloadmic_target_la_SOURCES): Remove offload_myo_target.cpp. (liboffloadmic_target_la_LIBADD): Remove libmyo-service.la. (libmyo_client_la_SOURCES, libmyo_service_la_SOURCES): Remove. (libmyo_client_la_DEPENDENCIES, libmyo_service_la_DEPENDENCIES): Remove. (libmyo_client_la_CPPFLAGS, libmyo_service_la_CPPFLAGS): Remove. (libmyo_client_la_LDFLAGS, libmyo_service_la_LDFLAGS): Remove. * Makefile.in: Regenerate. * doc/doxygen/header.tex: Merge from upstream, version 20160715 <https://openmprtl.org/sites/default/files/liboffload_oss_20160715.tgz>. * runtime/cean_util.cpp: Likewise. * runtime/cean_util.h: Likewise. * runtime/coi/coi_client.cpp: Likewise. * runtime/coi/coi_client.h: Likewise. * runtime/coi/coi_server.cpp: Likewise. * runtime/coi/coi_server.h: Likewise. * runtime/compiler_if_host.cpp: Likewise. * runtime/compiler_if_host.h: Likewise. * runtime/compiler_if_target.cpp: Likewise. * runtime/compiler_if_target.h: Likewise. * runtime/dv_util.cpp: Likewise. * runtime/dv_util.h: Likewise. * runtime/liboffload_error.c: Likewise. * runtime/liboffload_error_codes.h: Likewise. * runtime/liboffload_msg.c: Likewise. * runtime/liboffload_msg.h: Likewise. * runtime/mic_lib.f90: Likewise. * runtime/offload.h: Likewise. * runtime/offload_common.cpp: Likewise. * runtime/offload_common.h: Likewise. * runtime/offload_engine.cpp: Likewise. * runtime/offload_engine.h: Likewise. * runtime/offload_env.cpp: Likewise. * runtime/offload_env.h: Likewise. * runtime/offload_host.cpp: Likewise. * runtime/offload_host.h: Likewise. * runtime/offload_iterator.h: Likewise. * runtime/offload_myo_host.cpp: Likewise. * runtime/offload_myo_host.h: Likewise. * runtime/offload_myo_target.cpp: Likewise. * runtime/offload_myo_target.h: Likewise. * runtime/offload_omp_host.cpp: Likewise. * runtime/offload_omp_target.cpp: Likewise. * runtime/offload_orsl.cpp: Likewise. * runtime/offload_orsl.h: Likewise. * runtime/offload_table.cpp: Likewise. * runtime/offload_table.h: Likewise. * runtime/offload_target.cpp: Likewise. * runtime/offload_target.h: Likewise. * runtime/offload_target_main.cpp: Likewise. * runtime/offload_timer.h: Likewise. * runtime/offload_timer_host.cpp: Likewise. * runtime/offload_timer_target.cpp: Likewise. * runtime/offload_trace.cpp: Likewise. * runtime/offload_trace.h: Likewise. * runtime/offload_util.cpp: Likewise. * runtime/offload_util.h: Likewise. * runtime/ofldbegin.cpp: Likewise. * runtime/ofldend.cpp: Likewise. * runtime/orsl-lite/include/orsl-lite.h: Likewise. * runtime/orsl-lite/lib/orsl-lite.c: Likewise. * runtime/use_mpss2.txt: Remove. * include/coi/common/COIEngine_common.h: Merge from upstream, MPSS version 3.7.1 <http://registrationcenter-download.intel.com/akdlm/irc_nas/9226/ mpss-3.7.1-linux.tar>. * include/coi/common/COIEvent_common.h: Likewise. * include/coi/common/COIMacros_common.h: Likewise. * include/coi/common/COIPerf_common.h: Likewise. * include/coi/common/COIResult_common.h: Likewise. * include/coi/common/COISysInfo_common.h: Likewise. * include/coi/common/COITypes_common.h: Likewise. * include/coi/sink/COIBuffer_sink.h: Likewise. * include/coi/sink/COIPipeline_sink.h: Likewise. * include/coi/sink/COIProcess_sink.h: Likewise. * include/coi/source/COIBuffer_source.h: Likewise. * include/coi/source/COIEngine_source.h: Likewise. * include/coi/source/COIEvent_source.h: Likewise. * include/coi/source/COIPipeline_source.h: Likewise. * include/coi/source/COIProcess_source.h: Likewise. * include/myo/myo.h: Remove. * include/myo/myoimpl.h: Remove. * include/myo/myotypes.h: Remove. * plugin/Makefile.am (AM_LDFLAGS): Remove -lmyo-service. * plugin/Makefile.in: Regenerate. * plugin/libgomp-plugin-intelmic.cpp (LD_LIBRARY_PATH_ENV): Remove. (MIC_LD_LIBRARY_PATH_ENV): Remove. (init): Do not set MIC_LD_LIBRARY_PATH. Now liboffloadmic uses only LD_LIBRARY_PATH. * plugin/offload_target_main.cpp: Update copyright years. * runtime/emulator/coi_common.h: Likewise. * runtime/emulator/coi_device.cpp: Likewise. * runtime/emulator/coi_device.h: Likewise. * runtime/emulator/coi_host.cpp: Likewise. (COIBufferCreate): Allow COI_BUFFER_OPENCL. (COIEngineGetInfo): Return COI_DEVICE_KNL instead of COI_ISA_x86_64. * runtime/emulator/coi_host.h: Update copyright years. * runtime/emulator/coi_version_asm.h: Likewise. * runtime/emulator/coi_version_linker_script.map: Likewise. * runtime/emulator/myo_client.cpp: Remove. * runtime/emulator/myo_service.cpp: Remove. * runtime/emulator/myo_service.h: Remove. * runtime/emulator/myo_version_asm.h: Remove. * runtime/emulator/myo_version_linker_script.map: Remove. From-SVN: r238603
191 lines
4.8 KiB
C++
191 lines
4.8 KiB
C++
/*
|
|
Copyright (c) 2014-2016 Intel Corporation. All Rights Reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions
|
|
are met:
|
|
|
|
* Redistributions of source code must retain the above copyright
|
|
notice, this list of conditions and the following disclaimer.
|
|
* 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.
|
|
* Neither the name of Intel Corporation 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.
|
|
*/
|
|
|
|
|
|
#if defined(LINUX) || defined(FREEBSD)
|
|
#include <mm_malloc.h>
|
|
#endif
|
|
|
|
#include "offload_common.h"
|
|
|
|
// The debug routines
|
|
|
|
#if OFFLOAD_DEBUG > 0
|
|
|
|
void __dump_bytes(
|
|
int trace_level,
|
|
const void *data,
|
|
int len
|
|
)
|
|
{
|
|
if (console_enabled > trace_level) {
|
|
const uint8_t *arr = (const uint8_t*) data;
|
|
char buffer[4096];
|
|
char *bufferp;
|
|
int count = 0;
|
|
|
|
bufferp = buffer;
|
|
while (len--) {
|
|
sprintf(bufferp, "%02x", *arr++);
|
|
bufferp += 2;
|
|
count++;
|
|
if ((count&3) == 0) {
|
|
sprintf(bufferp, " ");
|
|
bufferp++;
|
|
}
|
|
if ((count&63) == 0) {
|
|
OFFLOAD_DEBUG_TRACE(trace_level, "%s\n", buffer);
|
|
bufferp = buffer;
|
|
count = 0;
|
|
}
|
|
}
|
|
if (count) {
|
|
OFFLOAD_DEBUG_TRACE(trace_level, "%s\n", buffer);
|
|
}
|
|
}
|
|
}
|
|
#endif // OFFLOAD_DEBUG
|
|
|
|
// The Marshaller and associated routines
|
|
|
|
void Marshaller::send_data(
|
|
const void *data,
|
|
int64_t length
|
|
)
|
|
{
|
|
OFFLOAD_DEBUG_TRACE(2, "send_data(%p, %lld)\n",
|
|
data, length);
|
|
memcpy(buffer_ptr, data, (size_t)length);
|
|
buffer_ptr += length;
|
|
tfr_size += length;
|
|
}
|
|
|
|
void Marshaller::receive_data(
|
|
void *data,
|
|
int64_t length
|
|
)
|
|
{
|
|
OFFLOAD_DEBUG_TRACE(2, "receive_data(%p, %lld)\n",
|
|
data, length);
|
|
memcpy(data, buffer_ptr, (size_t)length);
|
|
buffer_ptr += length;
|
|
tfr_size += length;
|
|
}
|
|
|
|
// Send function pointer
|
|
void Marshaller::send_func_ptr(
|
|
const void* data
|
|
)
|
|
{
|
|
const char* name;
|
|
size_t length;
|
|
|
|
if (data != 0) {
|
|
name = __offload_funcs.find_name(data);
|
|
if (name == 0) {
|
|
#if OFFLOAD_DEBUG > 0
|
|
if (console_enabled > 2) {
|
|
__offload_funcs.dump();
|
|
}
|
|
#endif // OFFLOAD_DEBUG > 0
|
|
|
|
LIBOFFLOAD_ERROR(c_send_func_ptr, data);
|
|
exit(1);
|
|
}
|
|
length = strlen(name) + 1;
|
|
}
|
|
else {
|
|
name = "";
|
|
length = 1;
|
|
}
|
|
|
|
memcpy(buffer_ptr, name, length);
|
|
buffer_ptr += length;
|
|
tfr_size += length;
|
|
}
|
|
|
|
// Receive function pointer
|
|
void Marshaller::receive_func_ptr(
|
|
const void** data
|
|
)
|
|
{
|
|
const char* name;
|
|
size_t length;
|
|
|
|
name = (const char*) buffer_ptr;
|
|
if (name[0] != '\0') {
|
|
*data = __offload_funcs.find_addr(name);
|
|
if (*data == 0) {
|
|
#if OFFLOAD_DEBUG > 0
|
|
if (console_enabled > 2) {
|
|
__offload_funcs.dump();
|
|
}
|
|
#endif // OFFLOAD_DEBUG > 0
|
|
|
|
LIBOFFLOAD_ERROR(c_receive_func_ptr, name);
|
|
exit(1);
|
|
}
|
|
length = strlen(name) + 1;
|
|
}
|
|
else {
|
|
*data = 0;
|
|
length = 1;
|
|
}
|
|
|
|
buffer_ptr += length;
|
|
tfr_size += length;
|
|
}
|
|
|
|
// End of the Marshaller and associated routines
|
|
|
|
extern void *OFFLOAD_MALLOC(
|
|
size_t size,
|
|
size_t align
|
|
)
|
|
{
|
|
void *ptr;
|
|
int err;
|
|
|
|
OFFLOAD_DEBUG_TRACE(2, "%s(%lld, %lld)\n", __func__, size, align);
|
|
|
|
if (align < sizeof(void*)) {
|
|
align = sizeof(void*);
|
|
}
|
|
|
|
ptr = _mm_malloc(size, align);
|
|
if (ptr == NULL) {
|
|
LIBOFFLOAD_ERROR(c_offload_malloc, size, align);
|
|
exit(1);
|
|
}
|
|
|
|
OFFLOAD_DEBUG_TRACE(2, "%s returned %p\n", __func__, ptr);
|
|
|
|
return ptr;
|
|
}
|