From f48a2d7ab623d2046306ec310c490f935dc48dae Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sat, 4 Jul 2020 16:29:05 -0700 Subject: edit for c++11 stuff added to instructions.cc --- src/cuda-sim/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cuda-sim/Makefile b/src/cuda-sim/Makefile index 85d1c8c..2305ef0 100644 --- a/src/cuda-sim/Makefile +++ b/src/cuda-sim/Makefile @@ -48,6 +48,7 @@ ifeq ($(DEBUG),1) endif OPT += -I$(CUDA_INSTALL_PATH)/include -I$(OUTPUT_DIR)/ -I. -I$(SIM_OBJ_FILES_DIR) OPT += -fPIC +OPT += std=c++11 ifeq ($(TRACE),1) OPT += -DTRACING_ON=1 -- cgit v1.3 From f273d54336fc57d0c22741d96bc25b030c5f7f99 Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sat, 4 Jul 2020 16:49:33 -0700 Subject: trying again --- src/cuda-sim/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cuda-sim/Makefile b/src/cuda-sim/Makefile index 2305ef0..1ce6df0 100644 --- a/src/cuda-sim/Makefile +++ b/src/cuda-sim/Makefile @@ -48,7 +48,6 @@ ifeq ($(DEBUG),1) endif OPT += -I$(CUDA_INSTALL_PATH)/include -I$(OUTPUT_DIR)/ -I. -I$(SIM_OBJ_FILES_DIR) OPT += -fPIC -OPT += std=c++11 ifeq ($(TRACE),1) OPT += -DTRACING_ON=1 @@ -56,10 +55,10 @@ endif CXX_OPT = $(OPT) ifeq ($(INTEL),1) - CXX_OPT += -std=c++0x + CXX_OPT += -std=c++11 else ifeq ($(GNUC_CPP0X),1) - CXX_OPT += -std=c++0x + CXX_OPT += -std=c++11 endif endif -- cgit v1.3 From 6f2d125c1a4f445f33f03b08d1e6d677329b1b35 Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sat, 4 Jul 2020 17:05:27 -0700 Subject: okay, old school --- src/cuda-sim/Makefile | 4 ++-- src/cuda-sim/instructions.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cuda-sim/Makefile b/src/cuda-sim/Makefile index 1ce6df0..85d1c8c 100644 --- a/src/cuda-sim/Makefile +++ b/src/cuda-sim/Makefile @@ -55,10 +55,10 @@ endif CXX_OPT = $(OPT) ifeq ($(INTEL),1) - CXX_OPT += -std=c++11 + CXX_OPT += -std=c++0x else ifeq ($(GNUC_CPP0X),1) - CXX_OPT += -std=c++11 + CXX_OPT += -std=c++0x endif endif diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc index 1090ba4..9bdd53a 100644 --- a/src/cuda-sim/instructions.cc +++ b/src/cuda-sim/instructions.cc @@ -6561,7 +6561,7 @@ void video_mem_instruction(const ptx_instruction *pI, ptx_thread_info *thread, i case S32_TYPE: { // assert all operands are S32_TYPE: scalar_type = pI->get_scalar_type(); - for (auto scalar : scalar_type) + for (std::list::iterator scalar = scalar_type.begin(); scalar != scalar_type.end(); scalar++) { assert(scalar == S32_TYPE); } -- cgit v1.3 From 78f264024dd4542e731633b3e68d205a571b97b7 Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sat, 4 Jul 2020 17:21:43 -0700 Subject: edit --- src/cuda-sim/instructions.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc index 9bdd53a..8936fa8 100644 --- a/src/cuda-sim/instructions.cc +++ b/src/cuda-sim/instructions.cc @@ -6563,7 +6563,7 @@ void video_mem_instruction(const ptx_instruction *pI, ptx_thread_info *thread, i scalar_type = pI->get_scalar_type(); for (std::list::iterator scalar = scalar_type.begin(); scalar != scalar_type.end(); scalar++) { - assert(scalar == S32_TYPE); + assert(*scalar == S32_TYPE); } assert(scalar_type.size() == 3); scalar_type.clear(); -- cgit v1.3