Merge pull request #79 from purdue-aalp/dev

Merging dev-purdue to public-dev-gpgpu-sim-repo

1 files changed, 42 insertions, 7 deletions

diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc
index edd4fb9..a7c4ad3 100644
--- a/libcuda/cuda_runtime_api.cc
+++ b/libcuda/cuda_runtime_api.cc
@@ -338,10 +338,19 @@ struct _cuda_device_id *GPGPUSim_Init()
 		prop->minor = 2;
 		prop->totalGlobalMem = 0x80000000 /* 2 GB */;
 		prop->memPitch = 0;
-		prop->maxThreadsPerBlock = 512;
-		prop->maxThreadsDim[0] = 512;
-		prop->maxThreadsDim[1] = 512;
-		prop->maxThreadsDim[2] = 512;
+		if(prop->major >= 2) {
+			prop->maxThreadsPerBlock = 1024;
+			prop->maxThreadsDim[0] = 1024;
+			prop->maxThreadsDim[1] = 1024;
+		}
+		else
+		{
+			prop->maxThreadsPerBlock = 512;
+			prop->maxThreadsDim[0] = 512;
+			prop->maxThreadsDim[1] = 512;
+		}
+
+		prop->maxThreadsDim[2] = 64;
 		prop->maxGridSize[0] = 0x40000000;
 		prop->maxGridSize[1] = 0x40000000;
 		prop->maxGridSize[2] = 0x40000000;
@@ -354,6 +363,9 @@ struct _cuda_device_id *GPGPUSim_Init()
 #if (CUDART_VERSION >= 2010)
 		prop->multiProcessorCount = the_gpu->get_config().num_shader();
 #endif
+#if (CUDART_VERSION >= 4000)
+		prop->maxThreadsPerMultiProcessor = the_gpu->threads_per_core();
+#endif
 		the_gpu->set_prop(prop);
 		the_device = new _cuda_device_id(the_gpu);
 	}
@@ -2133,8 +2145,28 @@ cudaError_t CUDARTAPI cudaSetValidDevices(int *device_arr, int len)
 
 cudaError_t CUDARTAPI cudaSetDeviceFlags( int flags )
 {
-	cuda_not_implemented(__my_func__,__LINE__);
-	return g_last_cudaError = cudaErrorUnknown;
+    // This flag is implicitly always on (unless you are using the driver API). It is safe for GPGPU-Sim to
+    // just ignore it.
+    if ( cudaDeviceMapHost == flags ) {
+		return g_last_cudaError = cudaSuccess;
+    } else {
+	    cuda_not_implemented(__my_func__,__LINE__);
+	    return g_last_cudaError = cudaErrorUnknown;
+    }
+}
+
+size_t getMaxThreadsPerBlock(struct cudaFuncAttributes *attr) {
+  _cuda_device_id *dev = GPGPUSim_Init();
+  struct cudaDeviceProp prop;
+
+  prop = *dev->get_prop();
+
+  size_t max = prop.maxThreadsPerBlock;
+
+  if ((prop.regsPerBlock / attr->numRegs) < max)
+    max = prop.regsPerBlock / attr->numRegs;
+
+  return max;
 }
 
 cudaError_t CUDARTAPI cudaFuncGetAttributes(struct cudaFuncAttributes *attr, const char *hostFun )
@@ -2147,7 +2179,10 @@ cudaError_t CUDARTAPI cudaFuncGetAttributes(struct cudaFuncAttributes *attr, con
 		attr->constSizeBytes  = kinfo->cmem;
 		attr->localSizeBytes  = kinfo->lmem;
 		attr->numRegs         = kinfo->regs;
-		attr->maxThreadsPerBlock = 0; // from pragmas?
+		if(kinfo->maxthreads > 0)
+		  attr->maxThreadsPerBlock = kinfo->maxthreads;
+		else
+		  attr->maxThreadsPerBlock = getMaxThreadsPerBlock(attr);
 #if CUDART_VERSION >= 3000
 		attr->ptxVersion      = kinfo->ptx_version;
 		attr->binaryVersion   = kinfo->sm_target;