Merging

llvm/lib/Transforms/CMakeLists.txt

@@ -13,6 +13,7 @@ add_subdirectory(DFG2LLVM_CUDNN)
 add_subdirectory(DFG2LLVM_PROMISE)
 add_subdirectory(DFG2LLVM_NVPTX)
 add_subdirectory(DFG2LLVM_SPIR)
+add_subdirectory(DFG2LLVM_WrapperAPI)
 add_subdirectory(DFG2LLVM_X86)
 add_subdirectory(LocalMem)
 add_subdirectory(InPlaceDFG)

llvm/lib/Transforms/DFG2LLVM_CUDNN/DFG2LLVM_CUDNN.cpp

@@ -426,15 +426,6 @@ void CGT_CUDNN::codeGen(DFLeafNode* N) {
       case Intrinsic::visc_tensor_pool_mean:
       { /* llvm.visc.tensor.relu */
         DEBUG(errs() << F_cudnn->getName() << "\t: Handling tensor_pool_max\n");
-        // Tensor relu(a) is in place for argument a.
-        Value *Op = II->getOperand(0);
-
-        // Test the intrinsic operand for in place operation.
-        bool inplace = isValidOperandForInPlaceOperation(Op, F_cudnn, N);
-        // Code generation cannot continue if this is false, because the target
-        // only provides an in place operation
-        assert(inplace &&
-               "Operand not valid for in place operation. Code gen aborted.\n");
 
         // Argument list - tensorPooling(input, poolFunction, window_height, window_width, vertical_pad, horizontal_pad,
 	//                               vertical_stride, horizontal_stride);

llvm/lib/Transforms/DFG2LLVM_WrapperAPI/CMakeLists.txt

+if(WIN32 OR CYGWIN)
+  set(LLVM_LINK_COMPONENTS Core Support)
+endif()
+
+add_llvm_loadable_module( LLVMDFG2LLVM_WrapperAPI
+  DFG2LLVM_WrapperAPI.cpp
+
+  DEPENDS
+  intrinsics_gen
+  PLUGIN_TOOL
+  opt
+  )

llvm/lib/Transforms/DFG2LLVM_WrapperAPI/LLVMBuild.txt

+;===- ./lib/Transforms/DFG2LLVM_WrapperAPI/LLVMBuild.txt -------*- Conf -*--===;
+;
+;                     The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Library
+name = DFG2LLVM_WrapperAPI
+parent = Transforms