edits

[cdsspec-compiler.git] / src / edu / uci / eecs / specCompiler / codeGenerator / CodeGenerator.java

diff --git a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java
index 4e746682f4ac6bfef089810bc18708d144cbbb35..28609e6de8c3a47262adaed1e4ca4b9d714ddada 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java
@@ -312,35 +312,40 @@ public class CodeGenerator {
                                new File(homeDir + "/benchmark/ms-queue/main.c"),
                                new File(homeDir + "/benchmark/ms-queue/my_queue.h") };
 
-//             File[] srcRCU = { new File(homeDir
-//                             + "/benchmark/read-copy-update/rcu.cc") };
+               File[] srcRCU = { new File(homeDir
+                               + "/benchmark/read-copy-update/rcu.cc") };
 //             
                File[] srcTrylock = { new File(homeDir
                                + "/benchmark/trylock/trylock.c") };
 
-//             File[] srcDeque = {
-//                             new File(homeDir + "/benchmark/chase-lev-deque-bugfix/deque.c"),
-//                             new File(homeDir + "/benchmark/chase-lev-deque-bugfix/main.c"),
-//                             new File(homeDir + "/benchmark/chase-lev-deque-bugfix/testcase.c"),
-//                             new File(homeDir + "/benchmark/chase-lev-deque-bugfix/deque.h") };
+               File[] srcDeque = {
+                               new File(homeDir + "/benchmark/chase-lev-deque-bugfix/deque.c"),
+                               new File(homeDir + "/benchmark/chase-lev-deque-bugfix/main.c"),
+                               new File(homeDir + "/benchmark/chase-lev-deque-bugfix/testcase1.c"),
+                               new File(homeDir + "/benchmark/chase-lev-deque-bugfix/testcase2.c"),
+                               new File(homeDir + "/benchmark/chase-lev-deque-bugfix/deque.h") };
 //
-//             File[] srcMCSLock = {
-//                             new File(homeDir + "/benchmark/mcs-lock/mcs-lock.cc"),
-//                             new File(homeDir + "/benchmark/mcs-lock/mcs-lock.h") };
+               File[] srcMCSLock = {
+                               new File(homeDir + "/benchmark/mcs-lock/mcs-lock.cc"),
+                               new File(homeDir + "/benchmark/mcs-lock/mcs-lock.h") };
 //
-//             File[] srcSPSCQueue = {
-//                             new File(homeDir + "/benchmark/spsc-bugfix/spsc-queue.cc"),
-//                             new File(homeDir + "/benchmark/spsc-bugfix/eventcount.h"),
-//                             new File(homeDir + "/benchmark/spsc-bugfix/queue.h") };
+               File[] srcSPSCQueue = {
+                               new File(homeDir + "/benchmark/spsc-bugfix/spsc-queue.cc"),
+                               new File(homeDir + "/benchmark/spsc-bugfix/eventcount.h"),
+                               new File(homeDir + "/benchmark/spsc-bugfix/queue.h") };
+
+               File[] srcMPMCQueue = {
+                               new File(homeDir + "/benchmark/mpmc-queue/mpmc-queue.h"),
+                               new File(homeDir + "/benchmark/mpmc-queue/testcase1.cc"),
+                               new File(homeDir + "/benchmark/mpmc-queue/testcase2.cc"),
+                               new File(homeDir + "/benchmark/mpmc-queue/testcase3.cc"),
+                               new File(homeDir + "/benchmark/mpmc-queue/mpmc-queue.cc") };
 //
-//             File[] srcMPMCQueue = {
-//                             new File(homeDir + "/benchmark/mpmc-queue/mpmc-queue.h"),
-//                             new File(homeDir + "/benchmark/mpmc-queue/mpmc-queue.cc") };
-//
-//             File[][] sources = { srcLinuxRWLocks,  srcMSQueue, srcRCU,
+//             File[][] sources = {srcLinuxRWLock1 , srcMSQueue, srcRCU,
 //                             srcDeque, srcMCSLock, srcSPSCQueue, srcMPMCQueue, srcHashtable };
 
-                File[][] sources = {srcLinuxRWLock1, srcLinuxRWLock2, srcLinuxRWLock3};
+                File[][] sources = {srcDeque, srcLinuxRWLock1, srcLinuxRWLock2, srcLinuxRWLock3, srcMCSLock, srcHashtable, srcRCU, srcMSQueue, srcSPSCQueue, srcMPMCQueue};
+//              File[][] sources = {srcMSQueue};
                // Compile all the benchmarks
                for (int i = 0; i < sources.length; i++) {
                        CodeGenerator gen = new CodeGenerator(sources[i]);