Cleanup `extra.h` for pairs and add option to use that in DIS build

Also remove some unused code from the cleanupSemaphores utility

27 files changed, 86 insertions, 52 deletions

diff --git a/all_pairs/source/adpcm_dec/adpcm_dec.c b/all_pairs/source/adpcm_dec/adpcm_dec.c
index 6811e69..04a5746 100644
--- a/all_pairs/source/adpcm_dec/adpcm_dec.c
+++ b/all_pairs/source/adpcm_dec/adpcm_dec.c
@@ -708,7 +708,7 @@ void _Pragma( "entrypoint" ) adpcm_dec_main( void )
 int main(int argc, char **argv)
 {
   SET_UP
-  for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
         START_LOOP
         adpcm_dec_init();
         adpcm_dec_main();
diff --git a/all_pairs/source/adpcm_enc/adpcm_enc.c b/all_pairs/source/adpcm_enc/adpcm_enc.c
index d9fb09a..464768f 100644
--- a/all_pairs/source/adpcm_enc/adpcm_enc.c
+++ b/all_pairs/source/adpcm_enc/adpcm_enc.c
@@ -747,7 +747,7 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void)
 int main(int argc, char **argv)
 {
         SET_UP
-        for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 adpcm_enc_init();
                 adpcm_enc_main();
diff --git a/all_pairs/source/ammunition/ammunition.c b/all_pairs/source/ammunition/ammunition.c
index 224babd..269f4c0 100644
--- a/all_pairs/source/ammunition/ammunition.c
+++ b/all_pairs/source/ammunition/ammunition.c
@@ -1174,7 +1174,7 @@ void _Pragma( "entrypoint" ) ammunition_main( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 ammunition_init();
                 ammunition_main();
diff --git a/all_pairs/source/anagram/anagram.c b/all_pairs/source/anagram/anagram.c
index 8f140a3..b458fd2 100644
--- a/all_pairs/source/anagram/anagram.c
+++ b/all_pairs/source/anagram/anagram.c
@@ -659,7 +659,7 @@ int main(int argc, char **argv)
         SET_UP
         //int jobsComplete;
         //int maxJobs=100;
-        //for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        //for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 anagram_init();
                 anagram_main();
diff --git a/all_pairs/source/audiobeam/audiobeam.c b/all_pairs/source/audiobeam/audiobeam.c
index ed5d656..208de80 100644
--- a/all_pairs/source/audiobeam/audiobeam.c
+++ b/all_pairs/source/audiobeam/audiobeam.c
@@ -581,7 +581,7 @@ int main( int argc, char **argv )
         //SET_UP
         int jobsComplete;
         int maxJobs=100;
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
         //      START_LOOP
                 audiobeam_init();
                 audiobeam_main();
diff --git a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
index e77d15b..3f48539 100644
--- a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
@@ -707,7 +707,7 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void )
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 cjpeg_transupp_init();
                 cjpeg_transupp_main();
diff --git a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 7bef7ab..278725c 100644
--- a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -211,7 +211,7 @@ int cjpeg_wrbmp_return()
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 cjpeg_wrbmp_init();
                 cjpeg_wrbmp_main();
diff --git a/all_pairs/source/cleanupSemaphores.c b/all_pairs/source/cleanupSemaphores.c
index 71ff989..dde2bb3 100644
--- a/all_pairs/source/cleanupSemaphores.c
+++ b/all_pairs/source/cleanupSemaphores.c
@@ -3,8 +3,4 @@
 int main(){
         sem_unlink("/firstTacleSem");
         sem_unlink("/secondTacleSem");
-        sem_unlink("/thirdTacleSem");
-        sem_unlink("/fourthTacleSem");
-        //no longer in use; delete last line after running once
-        //sem_unlink("/cacheTacleSem");
 }
diff --git a/all_pairs/source/dijkstra/dijkstra.c b/all_pairs/source/dijkstra/dijkstra.c
index af86ea6..1b6a52f 100644
--- a/all_pairs/source/dijkstra/dijkstra.c
+++ b/all_pairs/source/dijkstra/dijkstra.c
@@ -193,7 +193,7 @@ void _Pragma( "entrypoint" ) dijkstra_main( void )
 int main(int argc, char** argv )
 {
         SET_UP
-        for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 dijkstra_init();
                 dijkstra_main();
diff --git a/all_pairs/source/empty.c b/all_pairs/source/empty.c
index e4fd214..c7c5f5d 100644
--- a/all_pairs/source/empty.c
+++ b/all_pairs/source/empty.c
@@ -3,7 +3,7 @@
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 STOP_LOOP
         }
diff --git a/all_pairs/source/epic/epic.c b/all_pairs/source/epic/epic.c
index 13ba442..e258a4a 100644
--- a/all_pairs/source/epic/epic.c
+++ b/all_pairs/source/epic/epic.c
@@ -1130,7 +1130,7 @@ int epic_return(){
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 epic_init();
                 epic_main();
diff --git a/all_pairs/source/extra.h b/all_pairs/source/extra.h
index bdbd1f5..0681250 100644
--- a/all_pairs/source/extra.h
+++ b/all_pairs/source/extra.h
@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  **/
+#define _GNU_SOURCE
 #include <fcntl.h>
 #include <limits.h>
 #include <semaphore.h>
@@ -30,23 +31,31 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
+#include <sched.h>
+
+// This is only visible if _GNU_SOURCE is defined, and that define does not
+// come along to places where this file is included. Address this by manually
+// forcing it into the global namespace.
+extern int sched_getcpu();
 
 // Benchmarks use SET_UP, START_LOOP, STOP_LOOP, and WRITE_TO_FILE
 // These are macros so that we can declare and maintain additional state inside
 // the benchmark.
-#define SET_UP if (argc < 8) {\
+#define SET_UP if (argc != 8) {\
         printf("Usage: %s <name> <runs> <my core> <other core> <other program> <runID> <lockID>", argv[0]);\
         exit(1);\
     }\
     char * thisProgram = argv[1];\
     int maxJobs = atoi(argv[2]);\
-    char * thisCore = argv[3];\
-    char * otherCore = argv[4];\
+    unsigned int thisCore = atoi(argv[3]);\
+    unsigned int otherCore = atoi(argv[4]);\
+    thisCore = sched_getcpu();\
     char * otherProgram = argv[5];\
     char * runID = argv[6];\
     int lockID = atoi(argv[7]);\
-    struct timespec start, end;\
+    struct timespec _start, _end;\
     int jobsComplete;\
+    int jobs_complete = -1;\
     long * startS = malloc(sizeof(long) *maxJobs);\
     long * startN = malloc(sizeof(long) *maxJobs);\
     long * endS = malloc(sizeof(long) *maxJobs);\
@@ -81,14 +90,19 @@
         perror("Error mapping shared memory");\
         exit(1);\
     }\
-    int error;\
     int val;
 
-#define SAVE_RESULTS if (jobsComplete > -1){\
-            startS[jobsComplete]=start.tv_sec;\
-            startN[jobsComplete]=start.tv_nsec;\
-            endS[jobsComplete]=end.tv_sec;\
-            endN[jobsComplete]=end.tv_nsec;}
+#define SAVE_RESULTS \
+     if(jobs_complete >= maxJobs) {\
+        fprintf(stderr, "Max jobs setting too small! Trying to record job #%d when we only have space for %d jobs. Exiting...\n", jobs_complete, maxJobs);\
+        exit(1);\
+    }\
+    if (jobs_complete > -1){\
+        startS[jobs_complete]=_start.tv_sec;\
+        startN[jobs_complete]=_start.tv_nsec;\
+        endS[jobs_complete]=_end.tv_sec;\
+        endN[jobs_complete]=_end.tv_nsec;\
+    }
 
 #define WRITE_TO_FILE {\
     munlockall();\
@@ -97,11 +111,11 @@
         perror("Error opening file. \n");\
         exit(1);\
     }\
-    for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){\
-        fprintf(fp, "%s %s %s %s %d %ld %ld %ld %ld %s %d \n",\
+    for(int i = 0; i <= jobs_complete; i++){\
+        fprintf(fp, "%s %s %u %u %d %ld %ld %ld %ld %s %d \n",\
         thisProgram, otherProgram, thisCore, otherCore, maxJobs,\
-        startS[jobsComplete], startN[jobsComplete], endS[jobsComplete], endN[jobsComplete],\
-        runID, jobsComplete);\
+        startS[i], startN[i], endS[i], endN[i],\
+        runID, i);\
     }\
     fclose(fp);\
     /* Clean up the barrier synchronization shared memory */\
@@ -127,8 +141,8 @@
     fclose(fp);
 
 // These timers should just be aliases to the hardware counters w/ some small adjustments
-#define START_TIMER clock_gettime(CLOCK_MONOTONIC, &start);
-#define STOP_TIMER clock_gettime(CLOCK_MONOTONIC, &end);
+#define START_TIMER clock_gettime(CLOCK_MONOTONIC, &_start);
+#define STOP_TIMER clock_gettime(CLOCK_MONOTONIC, &_end);
 
 //check value of sem
 //if sem=0, unlock
@@ -176,8 +190,8 @@
         __sync_bool_compare_and_swap(barrier, 1, 0);\
     }
 
-#define START_LOOP FIRST_UNLOCK FIRST_LOCK FLUSH_CACHES BARRIER_SYNC START_TIMER
-#define STOP_LOOP STOP_TIMER SAVE_RESULTS
+#define START_LOOP FIRST_UNLOCK FIRST_LOCK sched_yield(); FLUSH_CACHES BARRIER_SYNC START_TIMER
+#define STOP_LOOP STOP_TIMER jobs_complete++; SAVE_RESULTS
 
 
 /*
@@ -186,7 +200,7 @@ Intended structure
 main
 SET_UP
 notice that STOP LOOP negates the ++ if outout=0
-for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
         START_LOOP
         tacleInit();
         tacleMain();
diff --git a/all_pairs/source/fmref/fmref.c b/all_pairs/source/fmref/fmref.c
index 6be1436..bcc7ce6 100644
--- a/all_pairs/source/fmref/fmref.c
+++ b/all_pairs/source/fmref/fmref.c
@@ -78,7 +78,7 @@ int fmref_return(void)
 int main(int argc, char **argv){
 
         SET_UP
-        for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 fmref_init();
                 fmref_main();
diff --git a/all_pairs/source/g723_enc/g723_enc.c b/all_pairs/source/g723_enc/g723_enc.c
index 6f31210..331c821 100644
--- a/all_pairs/source/g723_enc/g723_enc.c
+++ b/all_pairs/source/g723_enc/g723_enc.c
@@ -875,7 +875,7 @@ int main( int argc, char **argv )
         //SET_UP
         int jobsComplete;
         int maxJobs=9;
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
         //      START_LOOP
                 g723_enc_init();
                 g723_enc_main();
diff --git a/all_pairs/source/gsm_dec/gsm_dec.c b/all_pairs/source/gsm_dec/gsm_dec.c
index 7a0a1bd..06d24d5 100644
--- a/all_pairs/source/gsm_dec/gsm_dec.c
+++ b/all_pairs/source/gsm_dec/gsm_dec.c
@@ -753,7 +753,7 @@ void _Pragma( "entrypoint" ) gsm_dec_main( void )
 int main( int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 gsm_dec_init();
                 gsm_dec_main();
diff --git a/all_pairs/source/gsm_enc/gsm_enc.c b/all_pairs/source/gsm_enc/gsm_enc.c
index cdac899..3f051ec 100644
--- a/all_pairs/source/gsm_enc/gsm_enc.c
+++ b/all_pairs/source/gsm_enc/gsm_enc.c
@@ -2061,7 +2061,7 @@ void gsm_enc_main( void )
 int main( int argc, char** argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 gsm_enc_init();
                 gsm_enc_main();
diff --git a/all_pairs/source/h264_dec/h264_dec.c b/all_pairs/source/h264_dec/h264_dec.c
index 76af705..1fed68b 100644
--- a/all_pairs/source/h264_dec/h264_dec.c
+++ b/all_pairs/source/h264_dec/h264_dec.c
@@ -598,7 +598,7 @@ void _Pragma( "entrypoint" )  h264_dec_main( void )
 int main( int argc, char** argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 h264_dec_init();
                 h264_dec_main();
diff --git a/all_pairs/source/huff_dec/huff_dec.c b/all_pairs/source/huff_dec/huff_dec.c
index 48bdf4b..b83b99d 100644
--- a/all_pairs/source/huff_dec/huff_dec.c
+++ b/all_pairs/source/huff_dec/huff_dec.c
@@ -382,7 +382,7 @@ int main( int argc, char **argv )
         //SET_UP
         int jobsComplete;
         int maxJobs=5;
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
         //      START_LOOP
                 huff_dec_init();
                 huff_dec_main();
diff --git a/all_pairs/source/huff_enc/huff_enc.c b/all_pairs/source/huff_enc/huff_enc.c
index 2e739e6..133fe95 100644
--- a/all_pairs/source/huff_enc/huff_enc.c
+++ b/all_pairs/source/huff_enc/huff_enc.c
@@ -578,7 +578,7 @@ void _Pragma( "entrypoint" ) huff_enc_main()
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 huff_enc_init();
                 huff_enc_main();
diff --git a/all_pairs/source/mpeg2/mpeg2.c b/all_pairs/source/mpeg2/mpeg2.c
index e89e1f9..a810744 100644
--- a/all_pairs/source/mpeg2/mpeg2.c
+++ b/all_pairs/source/mpeg2/mpeg2.c
@@ -13206,7 +13206,7 @@ void _Pragma ( "entrypoint" ) mpeg2_main( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 mpeg2_init();
                 mpeg2_main();
diff --git a/all_pairs/source/ndes/ndes.c b/all_pairs/source/ndes/ndes.c
index e56906f..b0f494c 100644
--- a/all_pairs/source/ndes/ndes.c
+++ b/all_pairs/source/ndes/ndes.c
@@ -366,7 +366,7 @@ void _Pragma( "entrypoint" ) ndes_main()
 int main( int argc, char **argv )
 {
         SET_UP
-        for(jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 ndes_init();
                 ndes_main();
diff --git a/all_pairs/source/petrinet/petrinet.c b/all_pairs/source/petrinet/petrinet.c
index 7c9e1a0..cabb40d 100644
--- a/all_pairs/source/petrinet/petrinet.c
+++ b/all_pairs/source/petrinet/petrinet.c
@@ -977,7 +977,7 @@ int main( int argc, char **argv )
 {
   SET_UP
 
-   for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){ 
+   for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){  
         
         START_LOOP
         petrinet_main();
diff --git a/all_pairs/source/rijndael_dec/rijndael_dec.c b/all_pairs/source/rijndael_dec/rijndael_dec.c
index 4082eff..93bb424 100644
--- a/all_pairs/source/rijndael_dec/rijndael_dec.c
+++ b/all_pairs/source/rijndael_dec/rijndael_dec.c
@@ -183,7 +183,7 @@ void _Pragma( "entrypoint" ) rijndael_dec_main( void )
 int main(int argc, char** argv)
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 rijndael_dec_init();
                 rijndael_dec_main();
diff --git a/all_pairs/source/rijndael_enc/rijndael_enc.c b/all_pairs/source/rijndael_enc/rijndael_enc.c
index f74d595..0c10353 100644
--- a/all_pairs/source/rijndael_enc/rijndael_enc.c
+++ b/all_pairs/source/rijndael_enc/rijndael_enc.c
@@ -226,7 +226,7 @@ void _Pragma( "entrypoint" ) rijndael_enc_main( void )
 int main( int argc, char** argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 rijndael_enc_init();
                 rijndael_enc_main();
diff --git a/all_pairs/source/statemate/statemate.c b/all_pairs/source/statemate/statemate.c
index 379366a..00491e5 100644
--- a/all_pairs/source/statemate/statemate.c
+++ b/all_pairs/source/statemate/statemate.c
@@ -1274,7 +1274,7 @@ void _Pragma ( "entrypoint" ) statemate_main( void )
 int main ( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 statemate_init();
                 statemate_main();
diff --git a/all_pairs/source/susan/susan.c b/all_pairs/source/susan/susan.c
index fb990b1..4bc4cb8 100644
--- a/all_pairs/source/susan/susan.c
+++ b/all_pairs/source/susan/susan.c
@@ -2002,7 +2002,7 @@ int susan_return( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=-1; jobsComplete<maxJobs; jobsComplete++){
+        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
                 START_LOOP
                 susan_init();
                 susan_main();
diff --git a/dis/Makefile b/dis/Makefile
index 7f3da39..957a39a 100755
--- a/dis/Makefile
+++ b/dis/Makefile
@@ -1,8 +1,18 @@
+# Copyright 2020 Joshua Bakita
+# Build the DIS benchmarks with all-pairs or unpaired instrumentation
+# (I know that this Makefile is mildly evil and breaks so many rules
+# that a good Makefile should follow. Sorry - at least I have one.)
 LIBLITMUS ?= /media/speedy/litmus/liblitmus
 CC ?= gcc
-override CFLAGS += -pthread -O2 -ggdb3 -I../baseline/source
+override CFLAGS += -pthread -O2
 LDFLAGS = -lrt -lm
-COMMON = ../baseline/source/extra.h
+
+# We need a different include path depending on the target, so use a
+# target-specific variable
+field matrix neighborhood pointer transitive update random_walk: override CFLAGS += -I../baseline/source
+field matrix neighborhood pointer transitive update random_walk: COMMON = ../baseline/source/extra.h
+field_all matrix_all neighborhood_all pointer_all transitive_all update_all: override CFLAGS += -I../all_pairs/source
+field_all matrix_all neighborhood_all pointer_all transitive_all update_all: COMMON = ../all_pairs/source/extra.h
 
 # Handle cases where we're also profiling with the MMDC on the i.MX6Q
 ifneq ($(shell grep "define MMDC 1" ../baseline/source/extra.h),)
@@ -15,12 +25,13 @@ ifneq ($(shell grep "define LITMUS 1" ../baseline/source/extra.h),)
         LDFLAGS += -L${LIBLITMUS} -llitmus
 endif
 
-
-all: field matrix neighborhood pointer transitive update random_walk
+all:
+baseline: field matrix neighborhood pointer transitive update random_walk
+pairs: field_all matrix_all neighborhood_all pointer_all transitive_all update_all
 
 .PHONY: clean
 clean:
-        rm field matrix neighborhood pointer transitive update random_walk
+        rm field_all matrix_all neighborhood_all pointer_all transitive_all update_all field matrix neighborhood pointer transitive update random_walk
 
 field: ${COMMON} ./Field/field.c
         $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
@@ -36,3 +47,16 @@ update: ${COMMON} ./Update/update.c
         $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
 random_walk: ${COMMON} random_walk.c
         $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+
+field_all: ${COMMON} ./Field/field.c
+        $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+matrix_all: ${COMMON} ./Matrix/ver2/matrix.c
+        $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+neighborhood_all: ${COMMON} ./Neighborhood/neighborhood.c
+        $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+pointer_all: ${COMMON} ./Pointer/pointer.c
+        $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+transitive_all: ${COMMON} ./Transitive/transitive.c
+        $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
+update_all: ${COMMON} ./Update/update.c
+        $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)