Changeset 8191203

Timestamp:

Mar 3, 2017, 10:12:10 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

c443d1d, d107010

Parents:

dd020c0 (diff), bf8da66 (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 plg2:software/cfa/cfa-cc

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• doc/proposals/flags.md (added)
• src/CodeTools/DeclStats.cc (modified) (2 diffs)
• src/libcfa/concurrency/monitor (modified) (2 diffs)
• src/libcfa/concurrency/monitor.c (modified) (1 diff)
• src/tests/.expect/concurrent/coroutine.txt (moved) (moved from src/tests/.expect/coroutine.txt)
• src/tests/.expect/concurrent/monitor.txt (moved) (moved from src/tests/.expect/monitor.txt)
• src/tests/.expect/concurrent/multi-monitor.txt (added)
• src/tests/.expect/concurrent/thread.txt (moved) (moved from src/tests/.expect/thread.txt)
• src/tests/Makefile.am (modified) (3 diffs)
• src/tests/Makefile.in (modified) (4 diffs)
• src/tests/monitor.c (modified) (1 diff)
• src/tests/multi-monitor.c (added)
• src/tests/test.py (modified) (4 diffs)

configure

@@ -3131 +3131 @@
 if test "${enable_threading+set}" = set; then :
   enableval=$enable_threading; case "${enableval}" in
-  yes) build_threading-"yes" ;;
+  yes) build_threading="yes" ;;
   no)  build_threading="no" ;;
   *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;

configure.ac

@@ -59 +59 @@
 AC_ARG_ENABLE(threading, AS_HELP_STRING([--enable-threading], [Build and install libcfa with threading support (Enabled by default)]),
 [case "${enableval}" in
-  yes) build_threading-"yes" ;;
+  yes) build_threading="yes" ;;
   no)  build_threading="no" ;;
   *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;

src/CodeTools/DeclStats.cc

@@ -200 +200 @@
                         // skip if already seen declaration for this function
                         const std::string& mangleName = decl->get_mangleName().empty() ? decl->get_name() : decl->get_mangleName();
-                        if ( ! seen_names.insert( mangleName ).second ) return;
+                        if ( ! seen_names.insert( mangleName ).second ) {
+                                maybeAccept( decl->get_statements(), *this );
+                                return;
+                        }
                         
                         Stats& stats = for_linkage[ decl->get_linkage() ];
@@ -228 +231 @@
 
                         analyzeFunc( fnTy, stats, stats.params, stats.returns );
+
+                        // analyze expressions in decl statements
+                        maybeAccept( decl->get_statements(), *this );
                 }
 

src/libcfa/concurrency/monitor

@@ -20 +20 @@
 #include "assert"
 #include "invoke.h"
+#include "stdlib"
 
 struct __monitor_t {
@@ -33 +34 @@
 }
 
+//Basic entering routine
 void enter(__monitor_t *);
 void leave(__monitor_t *);
 
+//Array entering routine
+void enter(__monitor_t **, int count);
+void leave(__monitor_t **, int count);
+
 struct monitor_guard_t {
-        __monitor_t * m;
+        __monitor_t ** m;
+        int count;
 };
 
-static inline void ?{}( monitor_guard_t * this, __monitor_t * m ) {
+static inline int ?<?(__monitor_t* lhs, __monitor_t* rhs) {
+        return ((intptr_t)lhs) < ((intptr_t)rhs);
+}
+
+static inline void ?{}( monitor_guard_t * this, __monitor_t ** m ) {
         this->m = m;
-        enter( this->m );
+        this->count = 1;
+        enter( *this->m );
+}
+
+static inline void ?{}( monitor_guard_t * this, __monitor_t ** m, int count ) {
+        this->m = m;
+        this->count = count;
+        qsort(this->m, count);
+        enter( this->m, this->count );
 }
 
 static inline void ^?{}( monitor_guard_t * this ) {
-        leave( this->m );
+        leave( this->m, this->count );
 }
 
+
 #endif //MONITOR_H

src/libcfa/concurrency/monitor.c

@@ -71 +71 @@
         }
 }
+
+void enter(__monitor_t ** monitors, int count) {
+        for(int i = 0; i < count; i++) {
+                // printf("%d\n", i);
+                enter( monitors[i] );
+        }
+}
+
+void leave(__monitor_t ** monitors, int count) {
+        for(int i = count - 1; i >= 0; i--) {
+                // printf("%d\n", i);
+                leave( monitors[i] );
+        }
+}

src/tests/Makefile.am

@@ -17 +17 @@
 debug=yes
 
+quick_test=vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once
+
+if BUILD_CONCURRENCY
+concurrent=yes
+quick_test+= coroutine thread monitor
+else
+concurrent=no
+endif
+
+
 # applies to both programs
 EXTRA_FLAGS =
@@ -30 +40 @@
 
 all-local :
-        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once coroutine thread
+        @+python test.py --debug=${debug} --concurrent=${concurrent} ${quick_test}
 
 all-tests :
-        @+python test.py --all --debug=${debug}         # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+python test.py --all --debug=${debug} --concurrent=${concurrent}              # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -39 +49 @@
 
 list :
-        @+python test.py --list
+        @+python test.py --list --concurrent=${concurrent}
 
 constant0-1DP : constant0-1.c

src/tests/Makefile.in

@@ -37 +37 @@
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_CONCURRENCY_TRUE@am__append_1 = coroutine thread monitor
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
         avl_test$(EXEEXT) constant0-1DP$(EXEEXT) \
@@ -222 +223 @@
 top_srcdir = @top_srcdir@
 debug = yes
+quick_test = vector_test avl_test operators numericConstants \
+        expression enum array typeof cast dtor-early-exit init_once \
+        $(am__append_1)
+@BUILD_CONCURRENCY_FALSE@concurrent = no
+@BUILD_CONCURRENCY_TRUE@concurrent = yes
 
 # applies to both programs
@@ -651 +657 @@
 
 all-local :
-        @+python test.py vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once coroutine thread
+        @+python test.py --debug=${debug} --concurrent=${concurrent} ${quick_test}
 
 all-tests :
-        @+python test.py --all --debug=${debug}         # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+python test.py --all --debug=${debug} --concurrent=${concurrent}              # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :
@@ -660 +666 @@
 
 list :
-        @+python test.py --list
+        @+python test.py --list --concurrent=${concurrent}
 
 constant0-1DP : constant0-1.c

src/tests/monitor.c

@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        monitor_guard_t g1 = { &this->m };
+        __monitor_t * mon = &this->m;
+        monitor_guard_t g1 = { &mon };
         {
-                monitor_guard_t g2 = { &this->m };
+                monitor_guard_t g2 = { &mon };
                 {
-                        monitor_guard_t g3 = { &this->m };
+                        monitor_guard_t g3 = { &mon };
                         this->value += 1;
                 }

src/tests/test.py

@@ -32 +32 @@
         return re.search("ELF\s([0-9]+)-bit", out).group(1)
 
-# reads the directory ./.expect and indentifies the tests
-def listTests():
-        machineType = getMachineType()
+def listTestsFolder(folder) :
+        path = ('./.expect/%s/' % folder) if folder else './.expect/'
+        subpath = "%s/" % folder if folder else ""
 
         # tests directly in the .expect folder will always be processed
-        generic_list = map(lambda fname: Test(fname, fname),
-                [splitext(f)[0] for f in listdir('./.expect')
+        return map(lambda fname: Test(fname, subpath + fname),
+                [splitext(f)[0] for f in listdir( path )
                 if not f.startswith('.') and f.endswith('.txt')
                 ])
 
+# reads the directory ./.expect and indentifies the tests
+def listTests( concurrent ):
+        machineType = getMachineType()
+
+        # tests directly in the .expect folder will always be processed
+        generic_list = listTestsFolder( "" )
+
         # tests in the machineType folder will be ran only for the corresponding compiler
-        typed_list = map(lambda fname: Test( fname, "%s/%s" % (machineType, fname) ),
-                [splitext(f)[0] for f in listdir("./.expect/%s" % machineType)
-                if not f.startswith('.') and f.endswith('.txt')
-                ])
+        typed_list = listTestsFolder( machineType )
+
+        # tests in the concurrent folder will be ran only if concurrency is enabled
+        concurrent_list = listTestsFolder( "concurrent" ) if concurrent else []
 
         # append both lists to get
-        return generic_list + typed_list
+        return generic_list + typed_list + concurrent_list;
 
 # helper functions to run terminal commands
@@ -194 +201 @@
                 sys.stderr.flush()
                 return test_failed
-        
+
         except KeyboardInterrupt:
                 test_failed = True
@@ -243 +250 @@
 parser = argparse.ArgumentParser(description='Script which runs cforall tests')
 parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='no')
+parser.add_argument('--concurrent', help='Run concurrent tests', type=yes_no, default='no')
 parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
 parser.add_argument('--list', help='List all test available', action='store_true')
@@ -261 +269 @@
 
 # fetch the liest of all valid tests
-allTests = listTests()
+allTests = listTests( options.concurrent )
 
 # if user wants all tests than no other treatement of the test list is required