merge fix

Author: tinebp

runtime/opae/vortex.cpp

@@ -514,318 +514,18 @@ class vx_device {
     return 0;
   }
 
-    opae_drv_api_t api_;
-    fpga_handle fpga_;
-    MemoryAllocator global_mem_;
-    DeviceConfig dcrs_;
-    uint64_t dev_caps_;
-    uint64_t isa_caps_;
-    uint64_t global_mem_size_;
-    uint64_t staging_wsid_;
-    uint64_t staging_ioaddr_;
-    uint8_t* staging_ptr_;
-    uint64_t staging_size_;
-    std::unordered_map<uint32_t, std::array<uint64_t, 32>> mpm_cache_;
-    int profiling_id_;
+  opae_drv_api_t api_;
+  fpga_handle fpga_;
+  MemoryAllocator global_mem_;
+  DeviceConfig dcrs_;
+  uint64_t dev_caps_;
+  uint64_t isa_caps_;
+  uint64_t global_mem_size_;
+  uint64_t staging_wsid_;
+  uint64_t staging_ioaddr_;
+  uint8_t *staging_ptr_;
+  uint64_t staging_size_;
+  std::unordered_map<uint32_t, std::array<uint64_t, 32>> mpm_cache_;
 };
 
-struct vx_buffer {
-    vx_device* device;
-    uint64_t addr;
-    uint64_t size;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-extern int vx_dev_open(vx_device_h* hdevice) {
-    if (nullptr == hdevice)
-        return  -1;
-
-    opae_drv_api_t api;
-    memset(&api, 0, sizeof(opae_drv_api_t));
-    if (drv_init(&api) !=0) {
-        return -1;
-    }
-
-    // allocate device object
-    auto device = new vx_device(api);
-    if (nullptr == device) {
-        return -1;
-    }
-
-    // initialize device
-    CHECK_ERR(device->init(), {
-        return err;
-    });
-
-    DBGPRINT("DEV_OPEN: hdevice=%p\n", (void*)device);
-
-    *hdevice = device;
-
-    return 0;
-}
-
-extern int vx_dev_close(vx_device_h hdevice) {
-    if (nullptr == hdevice)
-        return -1;
-
-    DBGPRINT("DEV_CLOSE: hdevice=%p\n", hdevice);
-
-    auto device = ((vx_device*)hdevice);
-
-#ifdef SCOPE
-    vx_scope_stop(hdevice);
-#endif
-
-    delete device;
-
-    drv_close();
-
-    return 0;
-}
-
-extern int vx_dev_caps(vx_device_h hdevice, uint32_t caps_id, uint64_t *value) {
-    if (nullptr == hdevice)
-        return -1;
-
-    vx_device *device = ((vx_device*)hdevice);
-
-    uint64_t _value;
-
-    CHECK_ERR(device->get_caps(caps_id, &_value), {
-        return err;
-    });
-
-    DBGPRINT("DEV_CAPS: hdevice=%p, caps_id=%d, value=%ld\n", hdevice, caps_id, _value);
-
-    *value = _value;
-
-    return 0;
-}
-
-extern int vx_mem_alloc(vx_device_h hdevice, uint64_t size, int flags, vx_buffer_h* hbuffer) {
-    if (nullptr == hdevice
-    || nullptr == hbuffer
-    || 0 == size)
-        return -1;
-
-    DBGPRINT("MEM_ALLOC: size=%ld, flags=0x%d\n", size, flags);
-
-    auto device = ((vx_device*)hdevice);
-
-    uint64_t dev_addr;
-    CHECK_ERR(device->mem_alloc(size, flags, &dev_addr), {
-        return err;
-    });
-
-    auto buffer = new vx_buffer{device, dev_addr, size};
-    if (nullptr == buffer) {
-        device->mem_free(dev_addr);
-        return -1;
-    }
-
-    DBGPRINT("MEM_ALLOC: hdevice=%p, size=%ld, flags=0x%d, hbuffer=%p\n", hdevice, size, flags, (void*)buffer);
-
-    *hbuffer = buffer;
-
-    return 0;
-}
-
-extern int vx_mem_reserve(vx_device_h hdevice, uint64_t address, uint64_t size, int flags, vx_buffer_h* hbuffer) {
-    if (nullptr == hdevice
-     || nullptr == hbuffer
-     || 0 == size)
-        return -1;
-
-    auto device = ((vx_device*)hdevice);
-
-    CHECK_ERR(device->mem_reserve(address, size, flags), {
-        return err;
-    });
-
-    auto buffer = new vx_buffer{device, address, size};
-    if (nullptr == buffer) {
-        device->mem_free(address);
-        return -1;
-    }
-
-    DBGPRINT("MEM_RESERVE: hdevice=%p, address=0x%lx, size=%ld, flags=0x%d, hbuffer=%p\n", hdevice, address, size, flags, (void*)buffer);
-
-    *hbuffer = buffer;
-
-    return 0;
-}
-
-extern int vx_mem_free(vx_buffer_h hbuffer) {
-    if (nullptr == hbuffer)
-        return 0;
-
-    DBGPRINT("MEM_FREE: hbuffer=%p\n", hbuffer);
-
-    auto buffer = ((vx_buffer*)hbuffer);
-    auto device = ((vx_device*)buffer->device);
-
-    vx_mem_access(hbuffer, 0, buffer->size, 0);
-
-    int err = device->mem_free(buffer->addr);
-
-    delete buffer;
-
-    return err;
-}
-
-extern int vx_mem_access(vx_buffer_h hbuffer, uint64_t offset, uint64_t size, int flags) {
-   if (nullptr == hbuffer)
-        return -1;
-
-    auto buffer = ((vx_buffer*)hbuffer);
-    auto device = ((vx_device*)buffer->device);
-
-    if ((offset + size) > buffer->size)
-        return -1;
-
-    DBGPRINT("MEM_ACCESS: hbuffer=%p, offset=%ld, size=%ld, flags=%d\n", hbuffer, offset, size, flags);
-
-    return device->mem_access(buffer->addr + offset, size, flags);
-}
-
-extern int vx_mem_address(vx_buffer_h hbuffer, uint64_t* address) {
-    if (nullptr == hbuffer)
-        return -1;
-
-    auto buffer = ((vx_buffer*)hbuffer);
-
-    DBGPRINT("MEM_ADDRESS: hbuffer=%p, address=0x%lx\n", hbuffer, buffer->addr);
-
-    *address = buffer->addr;
-
-    return 0;
-}
-
-extern int vx_mem_info(vx_device_h hdevice, uint64_t* mem_free, uint64_t* mem_used) {
-    if (nullptr == hdevice)
-        return -1;
-
-    auto device = ((vx_device*)hdevice);
-
-    uint64_t _mem_free, _mem_used;
-
-    CHECK_ERR(device->mem_info(&_mem_free, &_mem_used), {
-        return err;
-    });
-
-    DBGPRINT("MEM_INFO: hdevice=%p, mem_free=%ld, mem_used=%ld\n", hdevice, _mem_free, _mem_used);
-
-    if (mem_free) {
-        *mem_free = _mem_free;
-    }
-
-    if (mem_used) {
-        *mem_used = _mem_used;
-    }
-
-    return 0;
-}
-
-extern int vx_copy_to_dev(vx_buffer_h hbuffer, const void* host_ptr, uint64_t dst_offset, uint64_t size) {
-    if (nullptr == hbuffer || nullptr == host_ptr)
-        return -1;
-
-    auto buffer = ((vx_buffer*)hbuffer);
-    auto device = ((vx_device*)buffer->device);
-
-    if ((dst_offset + size) > buffer->size)
-        return -1;
-
-    DBGPRINT("COPY_TO_DEV: hbuffer=%p, host_addr=%p, dst_offset=%ld, size=%ld\n", hbuffer, host_ptr, dst_offset, size);
-
-    return device->upload(buffer->addr + dst_offset, host_ptr, size);
-}
-
-extern int vx_copy_from_dev(void* host_ptr, vx_buffer_h hbuffer, uint64_t src_offset, uint64_t size) {
-    if (nullptr == hbuffer || nullptr == host_ptr)
-        return -1;
-
-    auto buffer = ((vx_buffer*)hbuffer);
-    auto device = ((vx_device*)buffer->device);
-
-    if ((src_offset + size) > buffer->size)
-        return -1;
-
-    DBGPRINT("COPY_FROM_DEV: hbuffer=%p, host_addr=%p, src_offset=%ld, size=%ld\n", hbuffer, host_ptr, src_offset, size);
-
-    return device->download(host_ptr, buffer->addr + src_offset, size);
-}
-
-extern int vx_start(vx_device_h hdevice, vx_buffer_h hkernel, vx_buffer_h harguments) {
-    if (nullptr == hdevice || nullptr == hkernel || nullptr == harguments)
-        return -1;
-
-    DBGPRINT("START: hdevice=%p, hkernel=%p, harguments=%p\n", hdevice, hkernel, harguments);
-
-    auto device = ((vx_device*)hdevice);
-    auto kernel = ((vx_buffer*)hkernel);
-    auto arguments = ((vx_buffer*)harguments);
-
-    return device->start(kernel->addr, arguments->addr);
-}
-
-extern int vx_ready_wait(vx_device_h hdevice, uint64_t timeout) {
-    if (nullptr == hdevice)
-        return -1;
-
-    DBGPRINT("READY_WAIT: hdevice=%p, timeout=%ld\n", hdevice, timeout);
-
-    auto device = ((vx_device*)hdevice);
-
-    return device->ready_wait(timeout);
-}
-
-extern int vx_dcr_read(vx_device_h hdevice, uint32_t addr, uint32_t* value) {
-    if (nullptr == hdevice)
-        return -1;
-
-    auto device = (vx_device*)hdevice;
-
-    uint32_t _value;
-
-    CHECK_ERR(device->dcr_read(addr, &_value), {
-        return err;
-    });
-
-    DBGPRINT("DCR_READ: hdevice=%p, addr=0x%x, value=0x%x\n", hdevice, addr, _value);
-
-    *value = _value;
-
-    return 0;
-}
-
-extern int vx_dcr_write(vx_device_h hdevice, uint32_t addr, uint32_t value) {
-    if (nullptr == hdevice)
-        return -1;
-
-    DBGPRINT("DCR_WRITE: hdevice=%p, addr=0x%x, value=0x%x\n", hdevice, addr, value);
-
-    auto device = ((vx_device*)hdevice);
-
-    return device->dcr_write(addr, value);
-}
-
-extern int vx_mpm_query(vx_device_h hdevice, uint32_t addr, uint32_t core_id, uint64_t* value) {
-    if (nullptr == hdevice)
-        return -1;
-
-    auto device = ((vx_device*)hdevice);
-
-    uint64_t _value;
-
-    CHECK_ERR(device->mpm_query(addr, core_id, &_value), {
-        return err;
-    });
-
-    DBGPRINT("MPM_QUERY: hdevice=%p, addr=0x%x, core_id=%d, value=0x%lx\n", hdevice, addr, core_id, _value);
-
-    *value = _value;
-
-    return 0;
-}
+#include <callbacks.inc>