Changeset c899175

Timestamp:

May 4, 2022, 12:57:43 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

3b5dcfa

Parents:

1f4fde5 (diff), d1c47c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• benchmark/plot.py (modified) (1 diff)
• benchmark/process-mutilate.py (modified) (2 diffs)
• src/ControlStruct/MultiLevelExit.cpp (modified) (1 diff)

benchmark/plot.py

@@ -46 +46 @@
         "Median Update Latency" : Field('us'    , 0, True),
         "Tail Update Latency"   : Field('us'    , 0, True),
+        "Update Ratio"          : Field('%'     , 0, False),
 }
 

benchmark/process-mutilate.py

@@ -14 +14 @@
 parser = argparse.ArgumentParser(description='Python Script to convert output from mutilate to rmit like output')
 parser.add_argument('--out', nargs='?', type=argparse.FileType('w'), default=sys.stdout)
+parser.add_argument('--var', nargs='?', type=str, default='Target QPS')
 try:
         options =  parser.parse_args()
@@ -112 +113 @@
                         continue
 
-                d = { 'Target QPS': int(rate) }
+                d = { options.var : int(rate) }
 
                 w = extract( f, d )

src/ControlStruct/MultiLevelExit.cpp

@@ -594 +594 @@
                 }
 
+                // check if loop node and if so add else clause if it exists
+                const WhileDoStmt * whilePtr = dynamic_cast<const WhileDoStmt *>(kid.get());
+                if ( whilePtr && whilePtr->else_) ret.push_back(whilePtr->else_);
+                const ForStmt * forPtr = dynamic_cast<const ForStmt *>(kid.get());
+                if ( forPtr && forPtr->else_) ret.push_back(forPtr->else_);
+
                 if ( ! break_label.empty() ) {
                         ret.push_back( labelledNullStmt( ret.back()->location, break_label ) );