Skip to content

S
swiftshader
Commit 69661d88 by Antonio Maiorano Committed by swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com
Options

Remove uses of deprecated CreateAlignedLoad/Store builders

[XLA:CPU] Remove uses of deprecated CreateAlignedLoad/Store builders These are being removed in https://github.com/llvm/llvm-project/commit/f515ca8995ce3695c6e92d83ffca2012dc753bb3 Upstreaming original change made by Alexander Kornienko (alexfh@google.com) Bug: none Change-Id: I1b1553308cc40c7e99508fb5e3999e16049a8884 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/52868 Presubmit-Ready: Antonio Maiorano <amaiorano@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com> Commit-Queue: Antonio Maiorano <amaiorano@google.com>
parent 7cd8cc1a
Showing with 6 additions and 6 deletions
src/Reactor/LLVMReactor.cpp
...@@ -903,13 +903,13 @@ Value *Nucleus::createLoad(Value *ptr, Type *type, bool isVolatile, unsigned int ...@@ -903,13 +903,13 @@ Value *Nucleus::createLoad(Value *ptr, Type *type, bool isVolatile, unsigned int
if(!atomic) if(!atomic)
{ {
return V(jit->builder->CreateAlignedLoad(V(ptr), alignment, isVolatile)); return V(jit->builder->CreateAlignedLoad(V(ptr), llvm::MaybeAlign(alignment), isVolatile));
} }
else if(elTy->isIntegerTy() || elTy->isPointerTy()) else if(elTy->isIntegerTy() || elTy->isPointerTy())
{ {
// Integers and pointers can be atomically loaded by setting // Integers and pointers can be atomically loaded by setting
// the ordering constraint on the load instruction. // the ordering constraint on the load instruction.
auto load = jit->builder->CreateAlignedLoad(V(ptr), alignment, isVolatile); auto load = jit->builder->CreateAlignedLoad(V(ptr), llvm::MaybeAlign(alignment), isVolatile);
load->setAtomic(atomicOrdering(atomic, memoryOrder)); load->setAtomic(atomicOrdering(atomic, memoryOrder));
return V(load); return V(load);
} }
...@@ -921,7 +921,7 @@ Value *Nucleus::createLoad(Value *ptr, Type *type, bool isVolatile, unsigned int ...@@ -921,7 +921,7 @@ Value *Nucleus::createLoad(Value *ptr, Type *type, bool isVolatile, unsigned int
auto size = jit->module->getDataLayout().getTypeStoreSize(elTy); auto size = jit->module->getDataLayout().getTypeStoreSize(elTy);
auto elAsIntTy = llvm::IntegerType::get(*jit->context, size * 8); auto elAsIntTy = llvm::IntegerType::get(*jit->context, size * 8);
auto ptrCast = jit->builder->CreatePointerCast(V(ptr), elAsIntTy->getPointerTo()); auto ptrCast = jit->builder->CreatePointerCast(V(ptr), elAsIntTy->getPointerTo());
auto load = jit->builder->CreateAlignedLoad(ptrCast, alignment, isVolatile); auto load = jit->builder->CreateAlignedLoad(ptrCast, llvm::MaybeAlign(alignment), isVolatile);
load->setAtomic(atomicOrdering(atomic, memoryOrder)); load->setAtomic(atomicOrdering(atomic, memoryOrder));
auto loadCast = jit->builder->CreateBitCast(load, elTy); auto loadCast = jit->builder->CreateBitCast(load, elTy);
return V(loadCast); return V(loadCast);
...@@ -1003,13 +1003,13 @@ Value *Nucleus::createStore(Value *value, Value *ptr, Type *type, bool isVolatil ...@@ -1003,13 +1003,13 @@ Value *Nucleus::createStore(Value *value, Value *ptr, Type *type, bool isVolatil
if(!atomic) if(!atomic)
{ {
jit->builder->CreateAlignedStore(V(value), V(ptr), alignment, isVolatile); jit->builder->CreateAlignedStore(V(value), V(ptr), llvm::MaybeAlign(alignment), isVolatile);
} }
else if(elTy->isIntegerTy() || elTy->isPointerTy()) else if(elTy->isIntegerTy() || elTy->isPointerTy())
{ {
// Integers and pointers can be atomically stored by setting // Integers and pointers can be atomically stored by setting
// the ordering constraint on the store instruction. // the ordering constraint on the store instruction.
auto store = jit->builder->CreateAlignedStore(V(value), V(ptr), alignment, isVolatile); auto store = jit->builder->CreateAlignedStore(V(value), V(ptr), llvm::MaybeAlign(alignment), isVolatile);
store->setAtomic(atomicOrdering(atomic, memoryOrder)); store->setAtomic(atomicOrdering(atomic, memoryOrder));
} }
else if(elTy->isFloatTy() || elTy->isDoubleTy()) else if(elTy->isFloatTy() || elTy->isDoubleTy())
...@@ -1021,7 +1021,7 @@ Value *Nucleus::createStore(Value *value, Value *ptr, Type *type, bool isVolatil ...@@ -1021,7 +1021,7 @@ Value *Nucleus::createStore(Value *value, Value *ptr, Type *type, bool isVolatil
auto elAsIntTy = llvm::IntegerType::get(*jit->context, size * 8); auto elAsIntTy = llvm::IntegerType::get(*jit->context, size * 8);
auto valCast = jit->builder->CreateBitCast(V(value), elAsIntTy); auto valCast = jit->builder->CreateBitCast(V(value), elAsIntTy);
auto ptrCast = jit->builder->CreatePointerCast(V(ptr), elAsIntTy->getPointerTo()); auto ptrCast = jit->builder->CreatePointerCast(V(ptr), elAsIntTy->getPointerTo());
auto store = jit->builder->CreateAlignedStore(valCast, ptrCast, alignment, isVolatile); auto store = jit->builder->CreateAlignedStore(valCast, ptrCast, llvm::MaybeAlign(alignment), isVolatile);
store->setAtomic(atomicOrdering(atomic, memoryOrder)); store->setAtomic(atomicOrdering(atomic, memoryOrder));
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment