stelleg
diff --git a/‎llvm/.circleci/config.yml
Lines changed: 30 additions & 0 deletions b/‎llvm/.circleci/config.yml
Lines changed: 30 additions & 0 deletions
diff --git a/‎llvm/.gitignore
Lines changed: 5 additions & 0 deletions b/‎llvm/.gitignore
Lines changed: 5 additions & 0 deletions
diff --git a/‎llvm/898/sync_elimination_pfor_mb/main.c
Lines changed: 35 additions & 0 deletions b/‎llvm/898/sync_elimination_pfor_mb/main.c
Lines changed: 35 additions & 0 deletions
diff --git a/‎llvm/898/sync_elimination_pfor_mb/makefile
Lines changed: 16 additions & 0 deletions b/‎llvm/898/sync_elimination_pfor_mb/makefile
Lines changed: 16 additions & 0 deletions
diff --git a/‎llvm/LICENSE.TXT
Lines changed: 9 additions & 0 deletions b/‎llvm/LICENSE.TXT
Lines changed: 9 additions & 0 deletions
diff --git a/‎llvm/README.md
Lines changed: 24 additions & 0 deletions b/‎llvm/README.md
Lines changed: 24 additions & 0 deletions
diff --git a/‎llvm/README.txt
Lines changed: 0 additions & 18 deletions b/‎llvm/README.txt
Lines changed: 0 additions & 18 deletions
diff --git a/‎llvm/include/llvm-c/Core.h
Lines changed: 19 additions & 1 deletion b/‎llvm/include/llvm-c/Core.h
Lines changed: 19 additions & 1 deletion
diff --git a/‎llvm/include/llvm-c/Initialization.h
Lines changed: 1 addition & 0 deletions b/‎llvm/include/llvm-c/Initialization.h
Lines changed: 1 addition & 0 deletions
diff --git a/‎llvm/include/llvm-c/Transforms/Tapir.h
Lines changed: 50 additions & 0 deletions b/‎llvm/include/llvm-c/Transforms/Tapir.h
Lines changed: 50 additions & 0 deletions
diff --git a/‎llvm/include/llvm/Analysis/AliasAnalysis.h
Lines changed: 23 additions & 0 deletions b/‎llvm/include/llvm/Analysis/AliasAnalysis.h
Lines changed: 23 additions & 0 deletions
@@ -0,0 +1,30 @@
+version: 2
+jobs:
+  build:
+    resource_class: xlarge
+    docker:
+      - image: wsmoses/tapir:latest
+
+    steps:
+      - checkout
+      - run:
+          name: submodules
+          command: |
+            git submodule sync
+            git submodule update --init --recursive
+      - run:
+          name: cmake
+          command: |
+            mkdir build
+            cd build
+            cmake .. -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD=host -DLLVM_BUILD_TESTS=ON -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ENABLE_LTO=OFF -DLLVM_PARALLEL_COMPILE_JOBS=2 -DLLVM_PARALLEL_LINK_JOBS=1
+      - run:
+          name: make
+          command: |
+            cd build
+            make -j2
+      - run:
+          name: test
+          command: |
+            cd build
+            make check-all
@@ -82,3 +82,8 @@ docs/_build
 #==============================================================================#
 bindings/go/llvm/llvm_config.go
 bindings/go/llvm/workdir
+
+build/*
+build
+build-debug/*
+build-debug
@@ -0,0 +1,35 @@
+#include <stdio.h>
+
+#include <cilk/cilk.h>
+
+#define N 100000000
+
+__attribute__((always_inline))
+int f(int x) {
+    return x * x;
+}
+
+__attribute__((always_inline))
+int g(int x) {
+    return x + 3;
+}
+
+int r1[N];
+int r2[N];
+
+int main(void)
+{
+    int sum = 0;
+
+    cilk_for (int i=0; i<N; i++) {
+        r1[i] = f(i) * g(i);
+    }
+
+    cilk_for (int i=0; i<N; i++) {
+        r2[i] = f(i) / g(i);
+    }
+
+    printf("%d %d\n", r1[N / 2], r2[N / 2]);
+
+    return 0;
+}
@@ -0,0 +1,16 @@
+all: main_o3 main_sync
+
+clean:
+	rm -f main_o3 main_sync
+
+main_o3:
+	clang -O3 -o main_o3 main.c
+	clang -O3 -S -emit-llvm -o main_o3.ll main.c
+
+main_sync:
+	clang -S -emit-llvm -o main_sync_raw.ll main.c
+	opt -O3 main_sync_raw.ll -S -o main_sync_o3.ll
+	opt -sync-elimination main_sync_o3.ll -S -o main_sync_sync_eliminated.ll
+	opt -simplifycfg -loop-simplify -loop-fuse main_sync_sync_eliminated.ll -S -o main_sync_loop_fused.ll
+	clang -O3 -o main_sync main_sync_loop_fused.ll
+	clang -O3 -S -emit-llvm -o main_sync.ll main_sync_loop_fused.ll
@@ -250,6 +250,15 @@ Developed by:
 
     http://llvm.org
 
+--------------------------
+Changes to implement Tapir
+--------------------------
+Copyright (c) 2016 William S. Moses and Tao B. Schardl.
+
+Developed by:
+
+    William S. Moses and Tao B. Schardl
+
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal with
 the Software without restriction, including without limitation the rights to
 
@@ -0,0 +1,24 @@
+Tapir/LLVM
+================================
+
+This directory and its subdirectories contain source code for
+Tapir/LLVM, a prototype compiler based on LLVM that implements the
+Tapir compiler IR extensions for fork-join parallelism.
+
+Tapir/LLVM is under active development.  This directory contains
+prototype implementations of compiler technologies that take advantage
+of the Tapir compiler IR.  These prototype technologies include the
+Rhino extensions to Tapir (unpublished).
+
+Tapir/LLVM is open source software.  You may freely distribute it
+under the terms of the license agreement found in LICENSE.txt.
+
+[![CircleCI](https://circleci.com/gh/wsmoses/Parallel-IR.svg?style=svg)](https://circleci.com/gh/wsmoses/Parallel-IR)
+
+
+# References
+
+T. B. Schardl, W. S. Moses, C. E. Leiserson.  "Tapir: Embedding
+Fork-Join Parallelism into LLVM's Intermediate Representation."  ACM
+PPoPP, February 2017, pp. 249-265.  Won Best Paper Award.
+http://dl.acm.org/citation.cfm?id=3018758
@@ -140,7 +140,12 @@ typedef enum {
   LLVMCatchRet       = 62,
   LLVMCatchPad       = 63,
   LLVMCleanupPad     = 64,
-  LLVMCatchSwitch    = 65
+  LLVMCatchSwitch    = 65,
+
+  /* Parallel operators */
+  LLVMDetach         = 66,
+  LLVMReattach       = 67,
+  LLVMSync           = 68
 } LLVMOpcode;
 
 typedef enum {
@@ -256,6 +261,10 @@ typedef enum {
   LLVMMemoryDefValueKind,
   LLVMMemoryPhiValueKind,
 
+  LLVMDetachUseValueKind,
+  LLVMDetachDefValueKind,
+  LLVMDetachPhiValueKind,
+
   LLVMFunctionValueKind,
   LLVMGlobalAliasValueKind,
   LLVMGlobalIFuncValueKind,
@@ -1578,6 +1587,9 @@ LLVMTypeRef LLVMX86MMXType(void);
       macro(CatchReturnInst)                \
       macro(CatchSwitchInst)                \
       macro(CallBrInst)                     \
+      macro(DetachInst)                     \
+      macro(ReattachInst)                   \
+      macro(SyncInst)                       \
       macro(FuncletPadInst)                 \
         macro(CatchPadInst)                 \
         macro(CleanupPadInst)               \
@@ -3618,6 +3630,12 @@ LLVMValueRef LLVMBuildCatchSwitch(LLVMBuilderRef B, LLVMValueRef ParentPad,
                                   LLVMBasicBlockRef UnwindBB,
                                   unsigned NumHandlers, const char *Name);
 
+/* Tapir */
+LLVMValueRef LLVMBuildDetach(LLVMBuilderRef,
+                             LLVMBasicBlockRef Child, LLVMBasicBlockRef Parent);
+LLVMValueRef LLVMBuildReattach(LLVMBuilderRef);
+LLVMValueRef LLVMBuildSync(LLVMBuilderRef, LLVMBasicBlockRef Continue);
+
 /* Add a case to the switch instruction */
 void LLVMAddCase(LLVMValueRef Switch, LLVMValueRef OnVal,
                  LLVMBasicBlockRef Dest);
 
@@ -35,6 +35,7 @@ void LLVMInitializeTransformUtils(LLVMPassRegistryRef R);
 void LLVMInitializeScalarOpts(LLVMPassRegistryRef R);
 void LLVMInitializeObjCARCOpts(LLVMPassRegistryRef R);
 void LLVMInitializeVectorization(LLVMPassRegistryRef R);
+void LLVMInitializeTapirOpts(LLVMPassRegistryRef R);
 void LLVMInitializeInstCombine(LLVMPassRegistryRef R);
 void LLVMInitializeAggressiveInstCombiner(LLVMPassRegistryRef R);
 void LLVMInitializeIPO(LLVMPassRegistryRef R);
 
@@ -0,0 +1,50 @@
+/*===---------------------------Tapir.h ------------------------- -*- C -*-===*\
+|*===----------- Tapir Transformation Library C Interface -----------------===*|
+|*                                                                            *|
+|*                     The LLVM Compiler Infrastructure                       *|
+|*                                                                            *|
+|* This file is distributed under the University of Illinois Open Source      *|
+|* License. See LICENSE.TXT for details.                                      *|
+|*                                                                            *|
+|*===----------------------------------------------------------------------===*|
+|*                                                                            *|
+|* This header declares the C interface to libLLVMTapirOpts.a, which          *|
+|* implements various Tapir transformations of the LLVM IR.                   *|
+|*                                                                            *|
+|* Many exotic languages can interoperate with C code but have a harder time  *|
+|* with C++ due to name mangling. So in addition to C, this interface enables *|
+|* tools written in such languages.                                           *|
+|*                                                                            *|
+\*===----------------------------------------------------------------------===*/
+
+#ifndef LLVM_C_TRANSFORMS_TAPIR_H
+#define LLVM_C_TRANSFORMS_TAPIR_H
+
+#include "llvm-c/Types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup LLVMCTransformsTapir Tapir transformations
+ * @ingroup LLVMCTransforms
+ *
+ * @{
+ */
+
+/** See llvm::createLoopSpawningPass function. */
+void LLVMAddLoopSpawningPass(LLVMPassManagerRef PM);
+
+/** See llvm::createLowerTapirToCilkPass function. */
+void LLVMAddLowerTapirToCilkPass(LLVMPassManagerRef PM);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif /* defined(__cplusplus) */
+
+#endif
@@ -529,6 +529,16 @@ class AAResults {
     return getModRefInfo(Call, MemoryLocation(P, Size));
   }
 
+  /// getModRefInfo (for detaches) - Return information about whether
+  /// a particular detach modifies or reads the specified memory location.
+  ModRefInfo getModRefInfo(const DetachInst *D, const MemoryLocation &Loc);
+
+  /// getModRefInfo (for detaches) - A convenience wrapper.
+  ModRefInfo getModRefInfo(const DetachInst *D, const Value *P,
+                           uint64_t Size) {
+    return getModRefInfo(D, MemoryLocation(P, Size));
+  }
+
   /// getModRefInfo (for loads) - Return information about whether
   /// a particular load modifies or reads the specified memory location.
   ModRefInfo getModRefInfo(const LoadInst *L, const MemoryLocation &Loc);
@@ -559,6 +569,15 @@ class AAResults {
     return getModRefInfo(S, MemoryLocation(P, Size));
   }
 
+  /// getModRefInfo (for syncs) - Return information about whether
+  /// a particular store modifies or reads the specified memory location.
+  ModRefInfo getModRefInfo(const SyncInst *S, const MemoryLocation &Loc);
+
+  /// getModRefInfo (for syncs) - A convenience wrapper.
+  ModRefInfo getModRefInfo(const SyncInst *S, const Value *P, uint64_t Size) {
+    return getModRefInfo(S, MemoryLocation(P, Size));
+  }
+
   /// getModRefInfo (for cmpxchges) - Return information about whether
   /// a particular cmpxchg modifies or reads the specified memory location.
   ModRefInfo getModRefInfo(const AtomicCmpXchgInst *CX,
@@ -748,6 +767,10 @@ class AAResults {
       return getModRefInfo((const CatchPadInst *)I, Loc, AAQIP);
     case Instruction::CatchRet:
       return getModRefInfo((const CatchReturnInst *)I, Loc, AAQIP);
+    case Instruction::Detach:
+      return getModRefInfo((const DetachInst *)I, Loc, AAQIP);
+    case Instruction::Sync:
+      return getModRefInfo((const SyncInst *)I, Loc, AAQIP);
     default:
       return ModRefInfo::NoModRef;
     }