summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve MacLean, Qualcomm Datacenter Technologies, Inc <sdmaclea@qti.qualcomm.com>2017-05-16 17:37:28 +0000
committerRuss Keldorph <russ.keldorph@microsoft.com>2017-06-01 09:39:20 -0700
commitf68e0e85b7f3caee90481857b67f418d68f3361e (patch)
tree8c3f59dbc7d4d9b7ca93dd747dc6aeb4fd3edbf2
parent6179b52eb1d48933675f4bd319448d02c7cef0c4 (diff)
downloadcoreclr-f68e0e85b7f3caee90481857b67f418d68f3361e.tar.gz
coreclr-f68e0e85b7f3caee90481857b67f418d68f3361e.tar.bz2
coreclr-f68e0e85b7f3caee90481857b67f418d68f3361e.zip
[Arm64] Use inner shareable for instGen_MemoryBarrier
-rw-r--r--src/jit/codegen.h2
-rw-r--r--src/jit/codegenarm64.cpp10
-rw-r--r--src/jit/codegenarmarch.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/jit/codegen.h b/src/jit/codegen.h
index b1b073862d..6261e42a14 100644
--- a/src/jit/codegen.h
+++ b/src/jit/codegen.h
@@ -960,7 +960,7 @@ public:
void instGen_Return(unsigned stkArgSize);
#ifdef _TARGET_ARM64_
- void instGen_MemoryBarrier(insBarrier barrierType = INS_BARRIER_SY);
+ void instGen_MemoryBarrier(insBarrier barrierType = INS_BARRIER_ISH);
#else
void instGen_MemoryBarrier();
#endif
diff --git a/src/jit/codegenarm64.cpp b/src/jit/codegenarm64.cpp
index 4ef7ef3c46..d73f7cea9d 100644
--- a/src/jit/codegenarm64.cpp
+++ b/src/jit/codegenarm64.cpp
@@ -2565,7 +2565,7 @@ void CodeGen::genCodeForInitBlkUnroll(GenTreeBlk* initBlkNode)
if (initBlkNode->gtFlags & GTF_BLK_VOLATILE)
{
- // issue a full memory barrier before a volatile an initBlockUnroll operation
+ // issue a full memory barrier before a volatile initBlockUnroll operation
instGen_MemoryBarrier();
}
@@ -2794,8 +2794,8 @@ void CodeGen::genCodeForCpBlkUnroll(GenTreeBlk* cpBlkNode)
if (cpBlkNode->gtFlags & GTF_BLK_VOLATILE)
{
- // issue a INS_BARRIER_LD after a volatile CpBlkUnroll operation
- instGen_MemoryBarrier(INS_BARRIER_LD);
+ // issue a INS_BARRIER_ISHLD after a volatile CpBlkUnroll operation
+ instGen_MemoryBarrier(INS_BARRIER_ISHLD);
}
}
@@ -2955,8 +2955,8 @@ void CodeGen::genCodeForCpObj(GenTreeObj* cpObjNode)
if (cpObjNode->gtFlags & GTF_BLK_VOLATILE)
{
- // issue a INS_BARRIER_LD after a volatile CpObj operation
- instGen_MemoryBarrier(INS_BARRIER_LD);
+ // issue a INS_BARRIER_ISHLD after a volatile CpObj operation
+ instGen_MemoryBarrier(INS_BARRIER_ISHLD);
}
// Clear the gcInfo for REG_WRITE_BARRIER_SRC_BYREF and REG_WRITE_BARRIER_DST_BYREF.
diff --git a/src/jit/codegenarmarch.cpp b/src/jit/codegenarmarch.cpp
index 911f07e2cc..16fcc93009 100644
--- a/src/jit/codegenarmarch.cpp
+++ b/src/jit/codegenarmarch.cpp
@@ -1384,8 +1384,8 @@ void CodeGen::genCodeForCpBlk(GenTreeBlk* cpBlkNode)
if (cpBlkNode->gtFlags & GTF_BLK_VOLATILE)
{
#ifdef _TARGET_ARM64_
- // issue a INS_BARRIER_LD after a volatile CpBlk operation
- instGen_MemoryBarrier(INS_BARRIER_LD);
+ // issue a INS_BARRIER_ISHLD after a volatile CpBlk operation
+ instGen_MemoryBarrier(INS_BARRIER_ISHLD);
#else
// issue a full memory barrier after a volatile CpBlk operation
instGen_MemoryBarrier();