[Beignet] [PATCH] GBE: CreateCall2 is removed in llvm 3.7.

[Yang, Rong R]

LGTM, pushed.

> -----Original Message-----
> From: Beignet [mailto:beignet-bounces at lists.freedesktop.org] On Behalf Of
> Ruiling Song
> Sent: Friday, November 20, 2015 15:49
> To: beignet at lists.freedesktop.org
> Cc: Song, Ruiling
> Subject: [Beignet] [PATCH] GBE: CreateCall2 is removed in llvm 3.7.
> 
> Signed-off-by: Ruiling Song <ruiling.song at intel.com>
> ---
>  backend/src/llvm/llvm_profiling.cpp | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/backend/src/llvm/llvm_profiling.cpp
> b/backend/src/llvm/llvm_profiling.cpp
> index 8c9157c..211aa43 100644
> --- a/backend/src/llvm/llvm_profiling.cpp
> +++ b/backend/src/llvm/llvm_profiling.cpp
> @@ -177,12 +177,13 @@ namespace gbe
>        builder->SetInsertPoint(instI);
>        /* Add the timestamp store function call. */
>        // __gen_ocl_store_timestamp(int nth, int type);
> -      builder->CreateCall2(cast<llvm::Function>(module-
> >getOrInsertFunction(
> +      Value *Args[2] = {ConstantInt::get(intTy, pointNum++),
> ConstantInt::get(intTy, profilingType)};
> +
> + builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
>                "__gen_ocl_calc_timestamp", Type::getVoidTy(module-
> >getContext()),
>                IntegerType::getInt32Ty(module->getContext()),
>                IntegerType::getInt32Ty(module->getContext()),
>                NULL)),
> -          /* the args */ ConstantInt::get(intTy, pointNum++),
> ConstantInt::get(intTy, profilingType));
> +              ArrayRef<Value*>(Args));
>      }
>      /* We insert one store_profiling at the end of the last block to hold the
> place. */
>      llvm::Function::iterator BE = F.end(); @@ -190,12 +191,14 @@ namespace
> gbe
>      BasicBlock::iterator retInst = BE->end();
>      retInst--;
>      builder->SetInsertPoint(retInst);
> -    builder->CreateCall2(cast<llvm::Function>(module->getOrInsertFunction(
> +    Value *Args2[2] = {profilingBuf, ConstantInt::get(intTy,
> + profilingType)};
> +
> +
> + builder->CreateCall(cast<llvm::Function>(module->getOrInsertFunction(
>              "__gen_ocl_store_profiling", Type::getVoidTy(module->getContext()),
>              ptrTy,
>              IntegerType::getInt32Ty(module->getContext()),
>              NULL)),
> -        /* the args */profilingBuf, ConstantInt::get(intTy, profilingType));
> +            ArrayRef<Value*>(Args2));
> 
>      delete builder;
>      return changed;
> --
> 2.4.1
> 
> _______________________________________________
> Beignet mailing list
> Beignet at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/beignet