From 92135f39b10e4494d2256950e4556df06e2b7906 Mon Sep 17 00:00:00 2001 From: Myrice Date: Mon, 6 Oct 2014 15:16:28 -0700 Subject: Add .gitignore file to ignore files generated after building --- .gitignore | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..53fadb5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +src/intersim2/lex.yy.c +src/intersim2/y.tab.c +src/intersim2/y.tab.h + +libcuda/cuobjdump_lexer.c +libcuda/cuobjdump_parser.c +libcuda/cuobjdump_parser.h +libcuda/cuobjdump_parser.output + +lib/* + +cuobjdump_to_ptxplus/elf_lexer.cc +cuobjdump_to_ptxplus/elf_parser.cc +cuobjdump_to_ptxplus/elf_parser.hh +cuobjdump_to_ptxplus/elf_parser.output +cuobjdump_to_ptxplus/header_lexer.cc +cuobjdump_to_ptxplus/header_parser.cc +cuobjdump_to_ptxplus/header_parser.hh +cuobjdump_to_ptxplus/header_parser.output +cuobjdump_to_ptxplus/lex.ptx_.c +cuobjdump_to_ptxplus/ptx.output +cuobjdump_to_ptxplus/ptx.tab.c +cuobjdump_to_ptxplus/ptx.tab.h +cuobjdump_to_ptxplus/sass_lexer.cc +cuobjdump_to_ptxplus/sass_parser.cc +cuobjdump_to_ptxplus/sass_parser.hh +cuobjdump_to_ptxplus/sass_parser.output + +build/* \ No newline at end of file -- cgit v1.3 From f11767af7a702df22597e378614ab707357678db Mon Sep 17 00:00:00 2001 From: Myrice Date: Mon, 6 Oct 2014 15:40:49 -0700 Subject: Fixed mac build fails 1. ptx_sim.h::473, stack cannot use incomplete type "operand_info" which is a forward declaration. The reason is underlying implementation of stack is deque which need a complete type. It is better to remove forward declaration by break circular dependence for future fixes. It is also benefit unit test 2. shader.h::1334, this hack cannot pass clang. Clang does not allow a array with not a explicit size. Please fix this hack by correct implementation as soon as possible 3. The default parameter causes clang to fail because it frustrate the compiler. This is still under discussion whether such implementation is correct. http://stackoverflow.com/questions/18313509/default-argument-gcc-vs-clang. I changed it to two constructors to avoid confusion. --- src/cuda-sim/ptx_sim.h | 2 +- src/gpgpu-sim/shader.h | 2 +- src/gpuwattch/cacti/nuca.cc | 9 +++++++-- src/gpuwattch/cacti/nuca.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/cuda-sim/ptx_sim.h b/src/cuda-sim/ptx_sim.h index 610efa2..f926e6d 100644 --- a/src/cuda-sim/ptx_sim.h +++ b/src/cuda-sim/ptx_sim.h @@ -470,7 +470,7 @@ private: std::list m_debug_trace_regs_read; bool m_enable_debug_trace; - std::stack m_breakaddrs; + std::stack > m_breakaddrs; }; addr_t generic_to_local( unsigned smid, unsigned hwtid, addr_t addr ); diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h index cf7160f..1aa468b 100644 --- a/src/gpgpu-sim/shader.h +++ b/src/gpgpu-sim/shader.h @@ -1331,7 +1331,7 @@ struct shader_core_config : public core_config struct shader_core_stats_pod { - void* shader_core_stats_pod_start[]; // DO NOT MOVE FROM THE TOP - spaceless pointer to the start of this structure + void* shader_core_stats_pod_start[0]; // DO NOT MOVE FROM THE TOP - spaceless pointer to the start of this structure unsigned long long *shader_cycles; unsigned *m_num_sim_insn; // number of scalar thread instructions committed by this shader core unsigned *m_num_sim_winsn; // number of warp instructions committed by this shader core diff --git a/src/gpuwattch/cacti/nuca.cc b/src/gpuwattch/cacti/nuca.cc index 9518791..f31b0c8 100644 --- a/src/gpuwattch/cacti/nuca.cc +++ b/src/gpuwattch/cacti/nuca.cc @@ -42,8 +42,13 @@ unsigned int MIN_BANKSIZE=65536; int cont_stats[2 /*l2 or l3*/][5/* cores */][ROUTER_TYPES][7 /*banks*/][8 /* cycle time */]; - Nuca::Nuca( - TechnologyParameter::DeviceType *dt = &(g_tp.peri_global) +Nuca::Nuca():deviceType(&(g_tp.peri_global)) +{ + init_cont(); +} + +Nuca::Nuca( + TechnologyParameter::DeviceType *dt ):deviceType(dt) { init_cont(); diff --git a/src/gpuwattch/cacti/nuca.h b/src/gpuwattch/cacti/nuca.h index 89fec19..bbdee7d 100644 --- a/src/gpuwattch/cacti/nuca.h +++ b/src/gpuwattch/cacti/nuca.h @@ -75,6 +75,7 @@ class nuca_org_t { class Nuca : public Component { public: + Nuca(); Nuca( TechnologyParameter::DeviceType *dt); void print_router(); -- cgit v1.3 From 540871e0107d19a069d8b574516190445e6b54c6 Mon Sep 17 00:00:00 2001 From: Myrice Date: Mon, 6 Oct 2014 15:45:34 -0700 Subject: Remove -a which appends dependences. This causes make process too long and dependency file too big without a make clean --- src/gpuwattch/cacti/cacti.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gpuwattch/cacti/cacti.mk b/src/gpuwattch/cacti/cacti.mk index 1de6e9e..7f3c573 100644 --- a/src/gpuwattch/cacti/cacti.mk +++ b/src/gpuwattch/cacti/cacti.mk @@ -54,7 +54,7 @@ $(OUTPUT_DIR)/Makefile.makedepend: depend depend: touch $(OUTPUT_DIR)/Makefile.makedepend - makedepend -f$(OUTPUT_DIR)/Makefile.makedepend -p$(OUTPUT_DIR)/ -a $(SRCS) 2> /dev/null + makedepend -f$(OUTPUT_DIR)/Makefile.makedepend -p$(OUTPUT_DIR)/ $(SRCS) 2> /dev/null $(OUTPUT_DIR)/%.o : %.cc $(CXX) $(CXXFLAGS) -c $< -o $@ -- cgit v1.3