changes to mpmc spec and add notes to ms-queue

[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 93dae994a61539f741c9b1aa0bab5c511db11bdd..4acbfb623e57735f0eb8dd66cf9bde72d48c03fc 100644 (file)
--- a/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java
+++ b/src/edu/uci/eecs/specCompiler/codeGenerator/CodeGenerator.java
@@ -11,6 +11,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
+import edu.uci.eecs.specCompiler.specExtraction.CPClearConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineCheckConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.CPDefineConstruct;
 import edu.uci.eecs.specCompiler.specExtraction.ClassEndConstruct;
@@ -183,6 +184,19 @@ public class CodeGenerator {
                }
                codeAdditions.get(construct.file).add(addition);
        }
+       
+       private void CPClear2Code(CPClearConstruct construct) {
+               int lineNum = construct.beginLineNum;
+               ArrayList<String> newCode = CodeVariables.generateCPClear(
+                               _semantics, construct);
+
+               CodeAddition addition = new CodeAddition(lineNum, newCode);
+               if (!codeAdditions.containsKey(construct.file)) {
+                       codeAdditions.put(construct.file, new ArrayList<CodeAddition>());
+               }
+               codeAdditions.get(construct.file).add(addition);
+       }
+       
 
        /**
         * private void ClassEnd2Code(ClassEndConstruct construct) { int lineNum =
@@ -243,6 +257,8 @@ public class CodeGenerator {
                                CPDefine2Code((CPDefineConstruct) construct);
                        } else if (construct instanceof CPDefineCheckConstruct) {
                                CPDefineCheck2Code((CPDefineCheckConstruct) construct);
+                       } else if (construct instanceof CPClearConstruct) {
+                               CPClear2Code((CPClearConstruct) construct);
                        } else if (construct instanceof EntryPointConstruct) {
                                EntryPoint2Code((EntryPointConstruct) construct);
                        }
@@ -254,11 +270,6 @@ public class CodeGenerator {
                // }
 
                // Sort code additions
-               HashSet<String> headers = CodeVariables.getAllHeaders(_semantics);
-               ArrayList<String> headerCode = new ArrayList<String>();
-               for (String header : headers) {
-                       headerCode.add("#include " + header);
-               }
                for (File file : codeAdditions.keySet()) {
                        ArrayList<CodeAddition> additions = codeAdditions.get(file);
 
@@ -269,12 +280,8 @@ public class CodeGenerator {
                        // Insert generated annotation to the source files
                        ArrayList<String> newContent = insertAnnotation2Src(additions,
                                        content);
-                       ArrayList<String> finalContent = new ArrayList<String>(
-                                       headerCode.size() + newContent.size());
-                       finalContent.addAll(headerCode);
-                       finalContent.addAll(newContent);
                        // Write it back to file
-                       ParserUtils.write2File(file, finalContent);
+                       ParserUtils.write2File(file, newContent);
                }
        }
 
@@ -284,11 +291,15 @@ public class CodeGenerator {
                File[] srcLinuxRWLocks = { new File(homeDir
                                + "/benchmark/linuxrwlocks/linuxrwlocks.c") };
 
-               File[] srcHashtable = { new File(homeDir
-                               + "/benchmark/cliffc-hashtable/simplified_cliffc_hashtable.h") };
+               File[] srcHashtable = {
+                               new File(homeDir
+                                               + "/benchmark/cliffc-hashtable/cliffc_hashtable.h"),
+                               new File(homeDir + "/benchmark/cliffc-hashtable/main.cc") };
 
                File[] srcMSQueue = {
                                new File(homeDir + "/benchmark/ms-queue/my_queue.c"),
+                               new File(homeDir + "/benchmark/ms-queue/testcase.c"),
+                               new File(homeDir + "/benchmark/ms-queue/testcase1.c"),
                                new File(homeDir + "/benchmark/ms-queue/main.c"),
                                new File(homeDir + "/benchmark/ms-queue/my_queue.h") };
 
@@ -312,11 +323,11 @@ public class CodeGenerator {
                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,
+//                             srcDeque, srcMCSLock, srcSPSCQueue, srcMPMCQueue, srcHashtable };
 
-//             File[][] sources = { srcLinuxRWLocks, srcHashtable, srcMSQueue, srcRCU,
-//                             srcDeque, srcMCSLock, srcSPSCQueue, srcMPMCQueue };
-
-                File[][] sources = { srcLinuxRWLocks };
+                File[][] sources = {srcMSQueue, srcMPMCQueue };
                // Compile all the benchmarks
                for (int i = 0; i < sources.length; i++) {
                        CodeGenerator gen = new CodeGenerator(sources[i]);