Changeset 6e1e2d0 for doc/theses/mike_brooks_MMath/benchmarks/list/_classic.c

Timestamp:

May 1, 2023, 4:19:09 PM (20 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c083c3d

Parents:

a50fdfb (diff), 985b624 (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:

resolved merge conflicts

File:

• doc/theses/mike_brooks_MMath/benchmarks/list/_classic.c (modified) (6 diffs)

doc/theses/mike_brooks_MMath/benchmarks/list/_classic.c

@@ -171 +171 @@
 #endif
 
-
-#define Repeat( op ) for ( volatile unsigned int i = 0; i < NoOfNodes; i += 1 ) { op; }
+volatile unsigned int t = 0;
+volatile unsigned int i_official = 0;
+
+#define Repeat( op ) for ( unsigned int i = 0; (i_official = i, i < NoOfNodes); i += 1 ) { op; }
 
 int main() {
@@ -192 +194 @@
         TAILQ_INIT(&lst);
         start = clock();
-        for ( volatile unsigned int t = 0; t < Times; t += 1 ) {
+        for ( t = 0; t < Times; t += 1 ) {
                 Repeat( TAILQ_INSERT_TAIL( &lst, &s[i], x ) );
                 Repeat( TAILQ_REMOVE( &lst, TAILQ_FIRST( &lst ), x ) );
@@ -204 +206 @@
         std::list<S *> lst;
         start = clock();
-        for ( volatile unsigned int t = 0; t < Times; t += 1 ) {
+        for ( t = 0; t < Times; t += 1 ) {
                 Repeat( lst.push_back( &s[i] ) );
                 Repeat( lst.pop_front() );
@@ -216 +218 @@
         uSequence<S> lst;
         start = clock();
-        for ( volatile unsigned int t = 0; t < Times; t += 1 ) {
+        for ( t = 0; t < Times; t += 1 ) {
                 Repeat( lst.addTail( &s[i] ) );
                 Repeat( lst.dropHead() );
@@ -228 +230 @@
         dlist(S) lst;
         start = clock();
-        for ( volatile unsigned int t = 0; t < Times; t += 1 ) {
+        for ( t = 0; t < Times; t += 1 ) {
                 Repeat( insert_last( lst, s[i] ) );
                 Repeat( remove( lst`first ) );
@@ -240 +242 @@
         Sequence(S) lst;
         start = clock();
-        for ( volatile unsigned int t = 0; t < Times; t += 1 ) {
+        for ( t = 0; t < Times; t += 1 ) {
                 Repeat( addHead( lst, s[i] ) );
                 Repeat( dropTail( lst ) );