Add CSQ (2/1) and CSQ (2/32), Del CSQ (2/2)

2012-03-27 00:31:16 +02:00 · 2012-03-27 00:31:16 +02:00 · 4914b0dcdd
parent a80decaef4
commit 4914b0dcdd
5 changed files with 13 additions and 4 deletions
--- a/communication_techniques/Makefile
+++ b/communication_techniques/Makefile
@ -24,9 +24,9 @@ BINNAMES:=batch_queue_2_comm batch_queue_4_comm batch_queue_8_comm
 BINNAMES+=batch_queue_16_comm batch_queue_32_comm batch_queue_64_comm
 BINNAMES+=batch_queue_128_comm batch_queue_256_comm batch_queue_512_comm
 BINNAMES+=batch_queue_1024_comm batch_queue_2048_comm batch_queue_4096_comm
-BINNAMES+=lamport_comm shared_mem_opt_comm none_comm csq_comm csq_2_2_comm
-BINNAMES+=csq_2_64_comm csq_64_1_comm fast_forward_comm mcringbuffer_comm
-BINNAMES+=pipe_comm gomp_stream_comm
+BINNAMES+=lamport_comm shared_mem_opt_comm none_comm csq_comm csq_2_1_comm
+BINNAMES+=csq_2_32_comm csq_2_64_comm csq_64_1_comm fast_forward_comm
+BINNAMES+=mcringbuffer_comm pipe_comm gomp_stream_comm
 #BINNAMES+=jikes_barrier_comm
 CALCLIBSNAMES:=calc_mat calc_line calc_useless_loop
 BINS:=$(patsubst %,$(BINDIR)/%,$(BINNAMES))
--- a/communication_techniques/include/csq_2_1_comm.h
+++ b/communication_techniques/include/csq_2_1_comm.h
@ -2,7 +2,7 @@
 #define _SPECIFIC_COMM_H_ 1

 #define SLOTS 2 /* Value used in the article, section V.A */
-#define BUF_SIZE (2 * CACHE_LINE_SIZE)
+#define BUF_SIZE (1 * CACHE_LINE_SIZE)
 #include <csq_common.h>

 #endif
--- a/communication_techniques/include/csq_2_32_comm.h
+++ b/communication_techniques/include/csq_2_32_comm.h
@ -0,0 +1,8 @@
+#ifndef _SPECIFIC_COMM_H_
+#define _SPECIFIC_COMM_H_ 1
+
+#define SLOTS 2 /* Value used in the article, section V.A */
+#define BUF_SIZE (32 * CACHE_LINE_SIZE)
+#include <csq_common.h>
+
+#endif
--- a/communication_techniques/src/communication/csq_2_1.c
+++ b/communication_techniques/src/communication/csq_2_1.c
--- a/communication_techniques/src/communication/csq_2_32.c
+++ b/communication_techniques/src/communication/csq_2_32.c
@ -0,0 +1 @@
+csq.c