Changeset 14a3dad2

Timestamp:

Mar 7, 2018, 1:45:25 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6dba9f99

Parents:

79d4186

Message:

Update code in CFA benchmark test listing

File:

• doc/papers/general/Paper.tex (modified) (1 diff)

doc/papers/general/Paper.tex

@@ -2549 +2549 @@
 \begin{cfa}[xleftmargin=3\parindentlnth,aboveskip=0pt,belowskip=0pt]
 int main( int argc, char * argv[] ) {
-        ofstream out = { "cfa-out.txt" };
         int max = 0, val = 42;
-        stack( int ) s, t;
-
-        REPEAT_TIMED( "push_int", N, push( s, val ); )
-        TIMED( "copy_int", t = s; )
-        TIMED( "clear_int", clear( s ); )
-        REPEAT_TIMED( "pop_int", N, int v = pop( t ); max = max( v, max ); )
-        REPEAT_TIMED( "print_int", N/2, out | val | ':' | val | endl; )
-
-        pair( _Bool, char ) max = { false, '\0' }, val = { true, 'a' };
-        stack( pair( _Bool, char ) ) s, t;
-
-        REPEAT_TIMED( "push_pair", N, push( s, val ); )
-        TIMED( "copy_pair", t = s; )
-        TIMED( "clear_pair", clear( s ); )
-        REPEAT_TIMED( "pop_pair", N, pair(_Bool, char) v = pop( t ); max = max( v, max ); )
-        REPEAT_TIMED( "print_pair", N/2, out | val | ':' | val | endl; )
+        stack( int ) si, ti;
+
+        REPEAT_TIMED( "push_int", N, push( si, val ); )
+        TIMED( "copy_int", ti = si; )
+        TIMED( "clear_int", clear( si ); )
+        REPEAT_TIMED( "pop_int", N, 
+                int x = pop( ti ); if ( x > max ) max = x; )
+
+        pair( _Bool, char ) max = { (_Bool)0, '\0' }, val = { (_Bool)1, 'a' };
+        stack( pair( _Bool, char ) ) sp, tp;
+
+        REPEAT_TIMED( "push_pair", N, push( sp, val ); )
+        TIMED( "copy_pair", tp = sp; )
+        TIMED( "clear_pair", clear( sp ); )
+        REPEAT_TIMED( "pop_pair", N,
+                pair(_Bool, char) x = pop( tp ); if ( x > max ) max = x; )
 }
 \end{cfa}