[GR-30472] [GR-27863] [GR-18878] [GR-30937] [GR-30728] [GR-30833] [GR-30804] Managed pthreads & synchronization primitives.

PullRequest: graal/8208

Author: fmorcos

sulong/CHANGELOG.md

@@ -4,6 +4,11 @@ Fixes:
 
 * Fix LLVM toolchain not working correctly for C++ on MacOS 11.3.
 
+* Fix exceptions being swallowed and not printed out on Sulong context disposal.
+
+* Thread return values are now correctly removed from the context when joining the
+  respective thread.
+
 New features:
 
 * Support implicitly typed XADD instructions in inline assembly.
@@ -12,6 +17,10 @@ New features:
   supported instructions are: xchg, cmpxchg and xadd along with their explicitly typed
   variants, and various unary instructions including incb/w/l/q and decb/w/l/q.
 
+* System calls that return pointers are now supported.
+
+* Support passing pointers as operands to inline assembly instructions.
+
 # Version 21.1.0
 
 New features:

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMLanguage.java

@@ -201,6 +201,11 @@ public static LLVMContext getContext() {
         return getCurrentContext(LLVMLanguage.class);
     }
 
+    @Override
+    protected void initializeThread(LLVMContext context, Thread thread) {
+        getCapability(PlatformCapability.class).initializeThread(context, thread);
+    }
+
     /**
      * Do not use this on fast-path.
      */

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/PlatformCapability.java

@@ -68,6 +68,11 @@ protected PlatformCapability(Class<S> cls) {
         valueToSysCall = initTable(cls);
     }
 
+    public void initializeThread(@SuppressWarnings("unused") LLVMContext context,
+                    @SuppressWarnings("unused") Thread thread) {
+        // Nothing needs to be done in Sulong for native thread initialization.
+    }
+
     @SuppressWarnings("unchecked")
     private S[] initTable(Class<S> cls) {
         S[] constants = cls.getEnumConstants();

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/asm/syscall/LLVMAMD64SyscallArchPrctlNode.java

@@ -65,18 +65,19 @@ protected long doOp(long code, LLVMPointer addr,
 
     private long exec(long code, LLVMPointer addr, LLVMContext context, LLVMPointerStoreNode store) throws AssertionError {
         switch (profile.profile((int) code)) {
-            case LLVMAMD64ArchPrctl.ARCH_SET_FS:
+            case LLVMAMD64ArchPrctl.ARCH_SET_FS: {
                 context.setThreadLocalStorage(addr);
-                break;
+                return 0;
+            }
             case LLVMAMD64ArchPrctl.ARCH_GET_FS: {
                 LLVMPointer tls = context.getThreadLocalStorage();
                 store.executeWithTarget(addr, tls);
-                break;
+                return 0;
             }
-            default:
+            default: {
                 CompilerDirectives.transferToInterpreter();
                 throw new AssertionError(String.format("not implemented: arch_prcntl(0x%04x)", code));
+            }
         }
-        return 0;
     }
 }

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/multithreading/LLVMPThreadStart.java

@@ -94,7 +94,6 @@ public void run() {
                         }
                     }
                 }
-                pThreadContext.clearThreadId();
             }
         }
     }
@@ -129,6 +128,11 @@ public static LLVMPThreadFunctionRootNode create(LLVMLanguage language, NodeFact
             return new LLVMPThreadFunctionRootNode(language, descriptor, functionSlot, argSlot, nodeFactory);
         }
 
+        @Override
+        public boolean isInternal() {
+            return false;
+        }
+
         @Override
         public Object execute(VirtualFrame frame) {
             if (ctxRef == null) {

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/nodes/intrinsics/multithreading/LLVMPThreadThreadIntrinsics.java

@@ -92,9 +92,9 @@ public abstract static class LLVMPThreadJoin extends LLVMBuiltin {
 
         @Specialization
         @TruffleBoundary
-        protected Object doIntrinsic(long threadId,
+        protected Object doIntrinsic(long threadID,
                         @CachedContext(LLVMLanguage.class) LLVMContext context) {
-            final Thread thread = context.getpThreadContext().getThread(threadId);
+            final Thread thread = context.getpThreadContext().getThread(threadID);
             if (thread != null) {
                 try {
                     thread.join();
@@ -104,7 +104,11 @@ protected Object doIntrinsic(long threadId,
                 }
             }
 
-            return context.getpThreadContext().getThreadReturnValue(threadId);
+            LLVMPThreadContext pthreadContext = context.getpThreadContext();
+            Object threadReturnValue = pthreadContext.getThreadReturnValue(threadID);
+            pthreadContext.clearThreadReturnValue(threadID);
+            pthreadContext.clearThreadID(threadID);
+            return threadReturnValue;
         }
     }
 

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/pthread/LLVMPThreadContext.java

@@ -51,8 +51,7 @@ public final class LLVMPThreadContext {
     private final Object threadLock;
 
     /**
-     * TODO GR-30833: At pthread_join, return values need to be cleared from the map of thread
-     * return values.
+     * At pthread_join, return values shall be cleared from this map of return values.
      */
     private final ConcurrentMap<Long, Object> threadReturnValueStorage;
 
@@ -96,14 +95,16 @@ public LLVMPThreadContext(TruffleLanguage.Env env, LLVMLanguage language, DataLa
 
     @TruffleBoundary
     public void joinAllThreads() {
-        final Collection<WeakReference<Thread>> threadsToJoin;
+        final Collection<WeakReference<Thread>> threads;
+
         synchronized (threadLock) {
             this.isCreateThreadAllowed = false;
-            threadsToJoin = threadStorage.values();
+            threads = threadStorage.values();
         }
-        for (WeakReference<Thread> createdThread : threadsToJoin) {
+
+        for (WeakReference<Thread> thread : threads) {
             try {
-                Thread t = createdThread.get();
+                Thread t = thread.get();
                 if (t != null) {
                     t.join();
                 }
@@ -209,18 +210,23 @@ public Thread getThread(long threadID) {
     }
 
     @TruffleBoundary
-    public void clearThreadId() {
-        threadStorage.remove(Thread.currentThread().getId());
+    public void clearThreadID(long threadID) {
+        threadStorage.remove(threadID);
+    }
+
+    @TruffleBoundary
+    public void setThreadReturnValue(long threadID, Object value) {
+        threadReturnValueStorage.put(threadID, value);
     }
 
     @TruffleBoundary
-    public void setThreadReturnValue(long threadId, Object value) {
-        threadReturnValueStorage.put(threadId, value);
+    public Object getThreadReturnValue(long threadID) {
+        return threadReturnValueStorage.get(threadID);
     }
 
     @TruffleBoundary
-    public Object getThreadReturnValue(long threadId) {
-        return threadReturnValueStorage.get(threadId);
+    public void clearThreadReturnValue(long threadID) {
+        threadReturnValueStorage.remove(threadID);
     }
 
     public CallTarget getPthreadCallTarget() {