summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPSuchita <[email protected]>2019-04-19 15:16:39 -0500
committerGitHub <[email protected]>2019-04-19 15:16:39 -0500
commit51c853e42c805275c64ee90c1c025e4b111fc570 (patch)
tree463dd5eb7f62b890eb0c11ab95f4026711609fde
parent537b342ab102b75a6da694b968b2226719b267c3 (diff)
parent3eabe77d908bfbf839730e28fd9222cb6461cab0 (diff)
Merge pull request #3 from PSuchita/gpgpu_compute_capability
changes for compute capabilty
-rw-r--r--configs/tested-cfgs/SM7_TITANV/gpgpusim.config1
-rw-r--r--libcuda/cuda_runtime_api.cc4
-rw-r--r--src/gpgpu-sim/gpu-sim.cc1
-rw-r--r--src/gpgpu-sim/gpu-sim.h3
4 files changed, 2 insertions, 7 deletions
diff --git a/configs/tested-cfgs/SM7_TITANV/gpgpusim.config b/configs/tested-cfgs/SM7_TITANV/gpgpusim.config
index a5b427f..9de1050 100644
--- a/configs/tested-cfgs/SM7_TITANV/gpgpusim.config
+++ b/configs/tested-cfgs/SM7_TITANV/gpgpusim.config
@@ -24,7 +24,6 @@
-gpgpu_compute_capability_major 7
-gpgpu_compute_capability_minor 0
-
# SASS execution (only supported with CUDA >= 4.0)
-gpgpu_ptx_convert_to_ptxplus 0
-gpgpu_ptx_save_converted_ptxplus 0
diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc
index 9068700..3a9d613 100644
--- a/libcuda/cuda_runtime_api.cc
+++ b/libcuda/cuda_runtime_api.cc
@@ -1120,10 +1120,10 @@ __host__ cudaError_t CUDARTAPI cudaDeviceGetAttribute(int *value, enum cudaDevic
case 41:
*value= 0;
break;
- case 75:// Major compute capability version number
+ case 75://cudaDevAttrComputeCapabilityMajor
*value= prop->major ;
break;
- case 76:// Minor compute capability version number
+ case 76://cudaDevAttrComputeCapabilityMinor
*value= prop->minor ;
break;
case 78:
diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc
index 358c0f7..3687448 100644
--- a/src/gpgpu-sim/gpu-sim.cc
+++ b/src/gpgpu-sim/gpu-sim.cc
@@ -810,7 +810,6 @@ void gpgpu_sim::set_prop( cudaDeviceProp *prop )
int gpgpu_sim::compute_capability_major() const
{
- printf("Everything works %d\n", m_config.gpgpu_compute_capability_major);
return m_config.gpgpu_compute_capability_major;
}
diff --git a/src/gpgpu-sim/gpu-sim.h b/src/gpgpu-sim/gpu-sim.h
index 39e1d9a..d4cc18f 100644
--- a/src/gpgpu-sim/gpu-sim.h
+++ b/src/gpgpu-sim/gpu-sim.h
@@ -391,7 +391,6 @@ private:
//gpu compute capability options
unsigned int gpgpu_compute_capability_major;
unsigned int gpgpu_compute_capability_minor;
-
unsigned long long liveness_message_freq;
friend class gpgpu_sim;
@@ -453,8 +452,6 @@ public:
int shared_mem_per_block() const;
int compute_capability_major() const;
int compute_capability_minor() const;
-
-
int num_registers_per_core() const;
int num_registers_per_block() const;
int wrp_size() const;