[Beignet] [PATCH] GBE: Load/store should use same address space as before.

[Zhigang Gong]

This patch LGTM, will push latter, thanks.

On Wed, Feb 11, 2015 at 10:59:09AM +0800, Ruiling Song wrote:
> Signed-off-by: Ruiling Song <ruiling.song at intel.com>
> ---
>  backend/src/llvm/ExpandLargeIntegers.cpp |   10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/backend/src/llvm/ExpandLargeIntegers.cpp b/backend/src/llvm/ExpandLargeIntegers.cpp
> index 2743cb1..194622c 100644
> --- a/backend/src/llvm/ExpandLargeIntegers.cpp
> +++ b/backend/src/llvm/ExpandLargeIntegers.cpp
> @@ -652,15 +652,16 @@ static void convertInstruction(Instruction *Inst, ConversionState &State,
>  
>    } else if (LoadInst *Load = dyn_cast<LoadInst>(Inst)) {
>      Value *Op = Load->getPointerOperand();
> +    unsigned AddrSpace = Op->getType()->getPointerAddressSpace();
>      TypePair Tys = getExpandedIntTypes(Load->getType());
>      AlignPair Align = getAlign(DL, Load, Load->getType());
> -    Value *Loty = IRB.CreateBitCast(Op, Tys.Lo->getPointerTo(),
> +    Value *Loty = IRB.CreateBitCast(Op, Tys.Lo->getPointerTo(AddrSpace),
>                                      Twine(Op->getName(), ".loty"));
>      Value *Lo =
>          IRB.CreateAlignedLoad(Loty, Align.Lo, Twine(Load->getName(), ".lo"));
>      Value *HiAddr =
>          IRB.CreateConstGEP1_32(Loty, 1, Twine(Op->getName(), ".hi.gep"));
> -    Value *HiTy = IRB.CreateBitCast(HiAddr, Tys.Hi->getPointerTo(),
> +    Value *HiTy = IRB.CreateBitCast(HiAddr, Tys.Hi->getPointerTo(AddrSpace),
>                                      Twine(Op->getName(), ".hity"));
>      Value *Hi =
>          IRB.CreateAlignedLoad(HiTy, Align.Hi, Twine(Load->getName(), ".hi"));
> @@ -668,15 +669,16 @@ static void convertInstruction(Instruction *Inst, ConversionState &State,
>  
>    } else if (StoreInst *Store = dyn_cast<StoreInst>(Inst)) {
>      Value *Ptr = Store->getPointerOperand();
> +    unsigned AddrSpace = Ptr->getType()->getPointerAddressSpace();
>      TypePair Tys = getExpandedIntTypes(Store->getValueOperand()->getType());
>      ValuePair StoreVals = State.getConverted(Store->getValueOperand());
>      AlignPair Align = getAlign(DL, Store, Store->getValueOperand()->getType());
> -    Value *Loty = IRB.CreateBitCast(Ptr, Tys.Lo->getPointerTo(),
> +    Value *Loty = IRB.CreateBitCast(Ptr, Tys.Lo->getPointerTo(AddrSpace),
>                                      Twine(Ptr->getName(), ".loty"));
>      Value *Lo = IRB.CreateAlignedStore(StoreVals.Lo, Loty, Align.Lo);
>      Value *HiAddr =
>          IRB.CreateConstGEP1_32(Loty, 1, Twine(Ptr->getName(), ".hi.gep"));
> -    Value *HiTy = IRB.CreateBitCast(HiAddr, Tys.Hi->getPointerTo(),
> +    Value *HiTy = IRB.CreateBitCast(HiAddr, Tys.Hi->getPointerTo(AddrSpace),
>                                      Twine(Ptr->getName(), ".hity"));
>      Value *Hi = IRB.CreateAlignedStore(StoreVals.Hi, HiTy, Align.Hi);
>      State.recordConverted(Store, ValuePair(Lo, Hi));
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Beignet mailing list
> Beignet at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/beignet