Better error reporting. (Xilinx#342)

* QDMA

* QDMA

* streaming support contd

* streaming support contd

* add missing file

* add missing file

* QDMA : hook in route_id and flow_id

* QDMA : hook in route_id and flow_id

* emove files mistakenly checked in

* emove files mistakenly checked in

* Remove files accidentally checked in.

* Remove files accidentally checked in.

* Some better error messages

* Improve error message

* Updates

* Extra sysinfo and path messages. Issue 314

.gitignore

@@ -9,3 +9,4 @@ docs/.doctrees
 tags
 *.mod
 *.ko
+*.nfs*

src/runtime_src/driver/xclng/xrt/user_aws/shim.cpp

@@ -458,7 +458,7 @@ namespace awsbwhal {
       std::lock_guard<std::mutex> lock(awsbwhal::deviceListMutex);
       if(xcldev::pci_device_scanner::device_list.size() == 0) {
         xcldev::pci_device_scanner devices;
-        devices.scan(true);
+        devices.scan(false);
       }
 
       unsigned i  = 0;
@@ -1134,7 +1134,7 @@ xclDeviceHandle xclOpen(unsigned deviceIndex, const char *logFileName, xclVerbos
         /* workaround necessary to load a default afi and program with xclbin when device is in a cleared state */
         xcldev::pci_device_scanner rescan;
         rescan.clear_device_list();
-        rescan.scan( true );
+        rescan.scan(false);
         for (unsigned int i=0; i<rescan.device_list.size(); i++) {
             std::cout << "device[" << i << "].user_instance : " << rescan.device_list[ i ].user_instance << std::endl;
             if (rescan.device_list[i].user_instance == 128) {
@@ -1294,7 +1294,7 @@ int xclBootFPGA(xclDeviceHandle handle)
     if( retVal == 0 )
     {
         xcldev::pci_device_scanner devScanner;
-        devScanner.scan( true ); // rescan pci devices
+        devScanner.scan(false); // rescan pci devices
     }
 
     return retVal;

src/runtime_src/driver/xclng/xrt/user_gem/shim.cpp

@@ -1762,7 +1762,7 @@ int xclBootFPGA(xclDeviceHandle handle)
     if( retVal == 0 )
     {
         xcldev::pci_device_scanner devScanner;
-        devScanner.scan( true ); // rescan pci devices
+        devScanner.scan(false); // rescan pci devices
     }
 
     return retVal;

src/runtime_src/xocl/api/clEnqueueNDRangeKernel.cpp

@@ -262,14 +262,14 @@ validOrError(cl_command_queue command_queue,
                << cu->get_name()
                << "\" of kernel \""
                << xkernel->get_name()
-               << "\" for argument \"" << arg->get_name() << "\" "
-               << "does not match the physical connectivity from the binary.\n"
+               << "\" for argument name \"" << arg->get_name() << "\" "
+               << "does not match the connectivity from the xclbin.\n"
                << "Memory bank mask specified for argument ";
           if (mem_memidx_mask.any())
             ostr << "is \"" << mem_memidx_mask << "\"";
           else
             ostr << "does not exist";
-          ostr << " while memory bank mask in binary is \"" << cu_memidx_mask << "\".";
+          ostr << " while memory bank mask in xclbin is \"" << cu_memidx_mask << "\".";
           XOCL_DEBUG(std::cout,ostr.str(),"\n");
           if (!is_sw_emulation()) // pr Amit
             throw xocl::error(CL_MEM_OBJECT_ALLOCATION_FAILURE,ostr.str());

src/runtime_src/xocl/core/device.cpp

@@ -277,6 +277,9 @@ get_stream(xrt::device::stream_flags flags, xrt::device::stream_attrs attrs, con
     if(write &&  !(flags & CL_STREAM_WRITE_ONLY))
       throw xocl::error(CL_INVALID_OPERATION,"Connecting a write stream to non-write stream, argument " + ext->flags);
 
+    if(mem.m_type != MEM_STREAMING) 
+      throw xocl::error(CL_INVALID_OPERATION,"Connecting a streaming argument to non-streaming bank");
+
     xocl(kernel)->set_argument(ext->flags,sizeof(cl_mem),nullptr);
   }