redesigned driver demo, fixed startup code, removed --cpu from simx,

driver/sw/vx_utils.cpp

@@ -2,18 +2,45 @@
 #include <fstream>
 #include <cstring>
 #include <vortex.h>
+#include <config.h>
 
-int vx_upload_kernel_bytes(vx_device_h device, const void* content, size_t size) {
+extern int vx_dev_caps(int caps_id) {
+  switch (caps_id) {
+  case VX_CAPS_VERSION:
+    return 0;
+  case VX_CAPS_MAX_CORES:
+    return NUMBER_CORES;
+  case VX_CAPS_MAX_WARPS:
+    return NW;
+  case VX_CAPS_MAX_THREADS:
+    return NT;
+  case VX_CAPS_CACHE_LINESIZE:
+    return GLOBAL_BLOCK_SIZE_BYTES;
+  case VX_CAPS_LOCAL_MEM_SIZE:
+    return 0xffffffff;
+  case VX_CAPS_ALLOC_BASE_ADDR:
+    return 0x10000000;
+  case VX_CAPS_KERNEL_BASE_ADDR:
+    return 0x80000000;
+  default:
+    std::cout << "invalid caps id: " << caps_id << std::endl;
+    std::abort();
+    return 0;
+  }
+}
+
+extern int vx_upload_kernel_bytes(vx_device_h device, const void* content, size_t size) {
   int err = 0;
 
   if (NULL == content || 0 == size)
     return -1;
 
-  static constexpr uint32_t TRANSFER_SIZE = 4096;
+  uint32_t buffer_transfer_size = 4096;
+  uint32_t kernel_base_addr = vx_dev_caps(VX_CAPS_KERNEL_BASE_ADDR);
 
   // allocate device buffer
   vx_buffer_h buffer;
-  err = vx_alloc_shared_mem(device, TRANSFER_SIZE, &buffer);
+  err = vx_alloc_shared_mem(device, buffer_transfer_size, &buffer);
   if (err != 0)
     return -1; 
 
@@ -48,9 +75,9 @@ int vx_upload_kernel_bytes(vx_device_h device, const void* content, size_t size)
 
   size_t offset = 0;
   while (offset < size) {
-    auto chunk_size = std::min<size_t>(TRANSFER_SIZE, size - offset);
+    auto chunk_size = std::min<size_t>(buffer_transfer_size, size - offset);
     std::memcpy(buf_ptr, (uint8_t*)content + offset, chunk_size);
-    err = vx_copy_to_dev(buffer, VX_KERNEL_BASE_ADDR + offset, chunk_size, 0);
+    err = vx_copy_to_dev(buffer, kernel_base_addr + offset, chunk_size, 0);
     if (err != 0) {
       vx_buf_release(buffer);
       return err;
@@ -63,7 +90,7 @@ int vx_upload_kernel_bytes(vx_device_h device, const void* content, size_t size)
   return 0;
 }
 
-int vx_upload_kernel_file(vx_device_h device, const char* filename) {
+extern int vx_upload_kernel_file(vx_device_h device, const char* filename) {
   std::ifstream ifs(filename);
   if (!ifs) {
     std::cout << "error: " << filename << " not found" << std::endl;