Changeset 4e39f51

Timestamp:

Sep 30, 2020, 5:44:53 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

038110a

Parents:

29185fc

Message:

More work towards dynamically picking a framework, however initial-exec tls is not working correctly

Location:

doc/theses/thierry_delisle_PhD/code/readQ_example

Files:

• Makefile (added)
• proto-gui/main.cpp (modified) (6 diffs)
• thrdlib/Makefile (modified) (1 diff)
• thrdlib/cforall.cpp (added)
• thrdlib/thread.cpp (modified) (1 diff)

doc/theses/thierry_delisle_PhD/code/readQ_example/proto-gui/main.cpp

@@ -12 +12 @@
 using thrdlib::thread_t;
 
+
+extern __attribute__((aligned(128))) thread_local struct {
+        void * volatile this_thread;
+        void * volatile this_processor;
+        void * volatile this_stats;
+
+        struct {
+                volatile unsigned short disable_count;
+                volatile bool enabled;
+                volatile bool in_progress;
+        } preemption_state;
+
+        #if defined(__SIZEOF_INT128__)
+                __uint128_t rand_seed;
+        #else
+                uint64_t rand_seed;
+        #endif
+        struct {
+                uint64_t fwd_seed;
+                uint64_t bck_seed;
+        } ready_rng;
+} kernelTLS __attribute__ ((tls_model ( "initial-exec" )));
 
 //--------------------
@@ -182 +204 @@
         nproduce = 60;
 
+        const char * framework;
+
         for(;;) {
                 static struct option options[] = {
@@ -199 +223 @@
                         case -1:
                                 /* paranoid */ assert(optind <= argc);
+                                if( optind == argc ) {
+                                        std::cerr << "Must specify a framework" << std::endl;
+                                        goto usage;
+
+                                }
+                                framework = argv[optind];
                                 goto run;
                         case 'b':
@@ -231 +261 @@
                                 std::cerr << opt << std::endl;
                         usage:
-                                std::cerr << "Usage: " << argv[0] << " [options]" << std::endl;
+                                std::cerr << "Usage: " << argv[0] << " [options] framework" << std::endl;
                                 std::cerr << std::endl;
                                 std::cerr << "  -b, --buff=COUNT    Number of frames to buffer" << std::endl;
@@ -240 +270 @@
         }
         run:
+        assert( framework );
 
         frames.reset(new Frame[nframes]);
@@ -249 +280 @@
         std::cout << "(Buffering " << nframes << ")" << std::endl;
 
-        thrdlib::init( "fibre", 2 );
+        thrdlib::init( framework, 2 );
 
         thread_t stats     = thrdlib::create( Stats );

doc/theses/thierry_delisle_PhD/code/readQ_example/thrdlib/Makefile

@@ -1 @@
-all: fibre.so pthread.so
+all: fibre.so pthread.so cforall.so
 
 clean:
         rm -rf fibre.so pthread.so
 
+CXXFLAGS=-Wall -Wextra -O3 -g -fpic -std=c++17 -pthread -ftls-model=initial-exec
+
 pthread.so: pthread.cpp Makefile
-        $(CXX) -Wall -Wextra -O3 -g -shared -o ${@} -pthread -fpic ${<}
+        $(CXX) $(CXXFLAGS) -shared -o ${@} ${<}
 
 fibre.so: fibre.cpp Makefile
-        $(CXX) -Wall -Wextra -O3 -g -shared -o ${@} -pthread -fpic ${<} -lfibre
+        $(CXX) $(CXXFLAGS) -shared -o ${@} ${<} -lfibre
+
+CFAINC=${HOME}/local/include/cfa-dev
+CFALIB=${HOME}/local/lib/cfa-dev/x64-debug
+CFAFLAGS=-z execstack -I${CFAINC} -I${CFAINC}/concurrency -L${CFALIB} -Wl,-rpath,${CFALIB}
+
+cforall.so: cforall.cpp Makefile
+        $(CXX) $(CXXFLAGS) $(CFAFLAGS) -shared -o ${@} ${<} -lcfathread -lcfa -ldl -lm

doc/theses/thierry_delisle_PhD/code/readQ_example/thrdlib/thread.cpp

@@ -28 +28 @@
 
         const char * error = dlerror();
-        if ( error ) {
+        if ( required && error ) {
                 std::cerr << "Fetching symbol '" << symbol << "' failed with error '" << error << "'\n";
                 std::abort();