Edit generated runtime calls to tensor runtime, according to required

signatures.

llvm/lib/Transforms/DFG2LLVM_CUDNN/DFG2LLVM_CUDNN.cpp

@@ -56,9 +56,9 @@ private:
   InPlaceDFGAnalysis::InPlaceDFGParameter *IPP;
 
   // VISC Runtime API and Tensor runtime API
-  Constant* llvm_visc_initTensorRt; // FIXME: sync names
-  Constant* llvm_visc_cleanupTensorRt; // FIXME: add function
-  Constant* llvm_visc_requestTensor; // FIXME: add function
+  Constant* llvm_hpvm_initTensorRt; // FIXME: sync names
+  Constant* llvm_hpvm_cleanupTensorRt; // FIXME: add function
+  Constant* hpvm_request_tensor; // FIXME: add function
 
   // Functions
 
@@ -105,9 +105,9 @@ void CGT_CUDNN::initRuntimeAPI() {
   // - initialization
   // - cleanup
   // - request a tensor
-  DECLARE(llvm_visc_initTensorRt);
-  DECLARE(llvm_visc_cleanupTensorRt);
-  DECLARE(llvm_visc_requestTensor);
+  DECLARE(llvm_hpvm_initTensorRt);
+  DECLARE(llvm_hpvm_cleanupTensorRt);
+  DECLARE(hpvm_request_tensor);
 
   // Find visc.init and visc.cleanup calls, and add placeholder methods
   // for initialization and cleanup of the hpvm tensor runtime
@@ -115,12 +115,12 @@ void CGT_CUDNN::initRuntimeAPI() {
   Function* VI = M.getFunction("llvm.visc.init");
   assert(VI->getNumUses() == 1 && "__visc__init should only be used once\n");
   InitCall = cast<Instruction>(*VI->user_begin());
-  CallInst::Create(llvm_visc_initTensorRt, ArrayRef<Value*>(), "", InitCall);
+  CallInst::Create(llvm_hpvm_initTensorRt, ArrayRef<Value*>(), "", InitCall);
 
   Function* VC = M.getFunction("llvm.visc.cleanup");
   assert(VC->getNumUses() == 1 && "__visc__clear should only be used once\n");
   CleanupCall = cast<Instruction>(*VC->user_begin());
-  CallInst::Create(llvm_visc_cleanupTensorRt, ArrayRef<Value*>(), "", CleanupCall);
+  CallInst::Create(llvm_hpvm_cleanupTensorRt, ArrayRef<Value*>(), "", CleanupCall);
 
 }
 
@@ -178,15 +178,17 @@ void CGT_CUDNN::codeGen(DFLeafNode* N) {
   // This is the first instruction of the function, insert them before this
   Instruction* FI = &*(F_cudnn->getEntryBlock().begin());
 
-  // In this backend, the target device is GPU.
-  // Create an LLVM Value that represents the visc::GPU_TARGET FIXME
+  // In this backend, the target device is GPU, represented by i32 1.
+  ConstantInt *TargetDeviceID =
+    ConstantInt::get(Type::getInt32Ty(M.getContext()), -1);
 
   for (Function::arg_iterator ai = F_cudnn->arg_begin(),
        ae = F_cudnn->arg_end(); ai != ae; ++ai) {
     Argument* Arg = &*ai;
     if (Arg->getType()->isPointerTy()) {
-      CallInst::Create(llvm_visc_requestTensor,
-                       ArrayRef<Value*>(Arg), // FIXME: add second argument
+      Value *Args[] = {Arg, TargetDeviceID};
+      CallInst::Create(hpvm_request_tensor,
+                       ArrayRef<Value*>(Args, 2),
                        "", FI);
     }
   }