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
154 lines
4.8 KiB
C++
154 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.
|
|
*/
|
|
|
|
|
|
#include "offload_common.h"
|
|
|
|
bool __dv_is_contiguous(const ArrDesc *dvp)
|
|
{
|
|
if (dvp->Flags & ArrDescFlagsContiguous) {
|
|
return true;
|
|
}
|
|
|
|
if (dvp->Rank != 0) {
|
|
if (dvp->Dim[0].Mult != dvp->Len) {
|
|
return false;
|
|
}
|
|
for (int i = 1; i < dvp->Rank; i++) {
|
|
if (dvp->Dim[i].Mult !=
|
|
dvp->Dim[i-1].Extent * dvp->Dim[i-1].Mult) {
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool __dv_is_allocated(const ArrDesc *dvp)
|
|
{
|
|
return (dvp->Flags & ArrDescFlagsDefined);
|
|
}
|
|
|
|
uint64_t __dv_data_length(const ArrDesc *dvp)
|
|
{
|
|
uint64_t size;
|
|
|
|
if (dvp->Rank == 0) {
|
|
size = dvp->Len;
|
|
return size;
|
|
}
|
|
|
|
size = dvp->Len;
|
|
for (int i = 0; i < dvp->Rank; ++i) {
|
|
size += (dvp->Dim[i].Extent-1) * dvp->Dim[i].Mult;
|
|
}
|
|
return size;
|
|
}
|
|
|
|
uint64_t __dv_data_length(const ArrDesc *dvp, int64_t count)
|
|
{
|
|
if (dvp->Rank == 0) {
|
|
return count;
|
|
}
|
|
|
|
return count * dvp->Dim[0].Mult;
|
|
}
|
|
|
|
// Create CeanReadRanges data for reading contiguous ranges of
|
|
// noncontiguous array defined by the argument
|
|
CeanReadRanges * init_read_ranges_dv(const ArrDesc *dvp)
|
|
{
|
|
int64_t len;
|
|
int count;
|
|
int rank = dvp->Rank;
|
|
CeanReadRanges *res = NULL;
|
|
|
|
if (rank != 0) {
|
|
int i = 0;
|
|
len = dvp->Len;
|
|
if (dvp->Dim[0].Mult == len) {
|
|
for (i = 1; i < rank; i++) {
|
|
len *= dvp->Dim[i-1].Extent;
|
|
if (dvp->Dim[i].Mult != len) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
res = (CeanReadRanges *)malloc(
|
|
sizeof(CeanReadRanges) + (rank - i) * sizeof(CeanReadDim));
|
|
if (res == NULL)
|
|
LIBOFFLOAD_ERROR(c_malloc);
|
|
res -> last_noncont_ind = rank - i - 1;
|
|
count = 1;
|
|
for (; i < rank; i++) {
|
|
res->Dim[rank - i - 1].count = count;
|
|
res->Dim[rank - i - 1].size = dvp->Dim[i].Mult;
|
|
count *= dvp->Dim[i].Extent;
|
|
}
|
|
res -> range_max_number = count;
|
|
res -> range_size = len;
|
|
res -> ptr = (void*)dvp->Base;
|
|
res -> current_number = 0;
|
|
res -> init_offset = 0;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
#if OFFLOAD_DEBUG > 0
|
|
void __dv_desc_dump(const char *name, const ArrDesc *dvp)
|
|
{
|
|
OFFLOAD_TRACE(3, "%s DV %p\n", name, dvp);
|
|
|
|
if (dvp != 0) {
|
|
OFFLOAD_TRACE(3,
|
|
" dv->Base = 0x%lx\n"
|
|
" dv->Len = 0x%lx\n"
|
|
" dv->Offset = 0x%lx\n"
|
|
" dv->Flags = 0x%lx\n"
|
|
" dv->Rank = 0x%lx\n"
|
|
" dv->Resrvd = 0x%lx\n",
|
|
dvp->Base,
|
|
dvp->Len,
|
|
dvp->Offset,
|
|
dvp->Flags,
|
|
dvp->Rank,
|
|
dvp->Reserved);
|
|
|
|
for (int i = 0 ; i < dvp->Rank; i++) {
|
|
OFFLOAD_TRACE(3,
|
|
" (%d) Extent=%ld, Multiplier=%ld, LowerBound=%ld\n",
|
|
i,
|
|
dvp->Dim[i].Extent,
|
|
dvp->Dim[i].Mult,
|
|
dvp->Dim[i].LowerBound);
|
|
}
|
|
}
|
|
}
|
|
#endif // OFFLOAD_DEBUG > 0
|