Skip to content

[Mono] Intrinsify Interlocked.And and Interlocked.Or using LLVM #33253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EgorBo merged 3 commits into from
Mar 10, 2020
Merged

[Mono] Intrinsify Interlocked.And and Interlocked.Or using LLVM #33253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0449e1
Intrinsify Interlocked.And and Interlocked.Or
EgorBo Mar 5, 2020
f89d665
turns out Interlocked.And and Interlocked.Or return old value
EgorBo Mar 5, 2020
1466b2f
Remove llvm_only check
EgorBo Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions src/mono/mono/mini/intrinsics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,26 +1186,42 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
ins->type = (opcode == OP_ATOMIC_ADD_I4) ? STACK_I4 : STACK_I8;
MONO_ADD_INS (cfg->cbb, ins);
}
} else if (strcmp (cmethod->name, "Add") == 0 && fsig->param_count == 2) {
} else if (fsig->param_count == 2 &&
((strcmp (cmethod->name, "Add") == 0) ||
(strcmp (cmethod->name, "And") == 0) ||
(strcmp (cmethod->name, "Or") == 0))) {
guint32 opcode = 0;
guint32 opcode_i4 = 0;
guint32 opcode_i8 = 0;

if (strcmp (cmethod->name, "Add") == 0) {
opcode_i4 = OP_ATOMIC_ADD_I4;
opcode_i8 = OP_ATOMIC_ADD_I8;
} else if (strcmp (cmethod->name, "And") == 0) {
opcode_i4 = OP_ATOMIC_AND_I4;
opcode_i8 = OP_ATOMIC_AND_I8;
} else if (strcmp (cmethod->name, "Or") == 0) {
opcode_i4 = OP_ATOMIC_OR_I4;
opcode_i8 = OP_ATOMIC_OR_I8;
} else {
g_assert_not_reached ();
}

if (fsig->params [0]->type == MONO_TYPE_I4) {
opcode = OP_ATOMIC_ADD_I4;
opcode = opcode_i4;
cfg->has_atomic_add_i4 = TRUE;
} else if (fsig->params [0]->type == MONO_TYPE_I8 && SIZEOF_REGISTER == 8) {
opcode = opcode_i8;
}
#if SIZEOF_REGISTER == 8
else if (fsig->params [0]->type == MONO_TYPE_I8)
opcode = OP_ATOMIC_ADD_I8;
#endif
if (opcode) {
if (!mono_arch_opcode_supported (opcode))
return NULL;

// For now, only Add is supported in non-LLVM back-ends
if (opcode && (COMPILE_LLVM (cfg) || mono_arch_opcode_supported (opcode))) {
MONO_INST_NEW (cfg, ins, opcode);
ins->dreg = mono_alloc_ireg (cfg);
ins->inst_basereg = args [0]->dreg;
ins->inst_offset = 0;
ins->sreg2 = args [1]->dreg;
ins->type = (opcode == OP_ATOMIC_ADD_I4) ? STACK_I4 : STACK_I8;
ins->type = (opcode == opcode_i4) ? STACK_I4 : STACK_I8;
MONO_ADD_INS (cfg->cbb, ins);
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/mono/mono/mini/mini-llvm-cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ mono_llvm_build_atomic_rmw (LLVMBuilderRef builder, AtomicRMWOp op, LLVMValueRef
case LLVM_ATOMICRMW_OP_ADD:
aop = AtomicRMWInst::Add;
break;
case LLVM_ATOMICRMW_OP_AND:
aop = AtomicRMWInst::And;
break;
case LLVM_ATOMICRMW_OP_OR:
aop = AtomicRMWInst::Or;
break;
default:
g_assert_not_reached ();
break;
Expand Down
2 changes: 2 additions & 0 deletions src/mono/mono/mini/mini-llvm-cpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ typedef enum {
typedef enum {
LLVM_ATOMICRMW_OP_XCHG = 0,
LLVM_ATOMICRMW_OP_ADD = 1,
LLVM_ATOMICRMW_OP_AND = 2,
LLVM_ATOMICRMW_OP_OR = 3,
} AtomicRMWOp;

typedef enum {
Expand Down
21 changes: 17 additions & 4 deletions src/mono/mono/mini/mini-llvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6434,11 +6434,15 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
break;
}
case OP_ATOMIC_ADD_I4:
case OP_ATOMIC_ADD_I8: {
case OP_ATOMIC_ADD_I8:
case OP_ATOMIC_AND_I4:
case OP_ATOMIC_AND_I8:
case OP_ATOMIC_OR_I4:
case OP_ATOMIC_OR_I8: {
LLVMValueRef args [2];
LLVMTypeRef t;
if (ins->opcode == OP_ATOMIC_ADD_I4)

if (ins->type == STACK_I4)
t = LLVMInt32Type ();
else
t = LLVMInt64Type ();
Expand All @@ -6448,7 +6452,16 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
args [0] = convert (ctx, lhs, LLVMPointerType (t, 0));
args [1] = convert (ctx, rhs, t);
ARM64_ATOMIC_FENCE_FIX;
values [ins->dreg] = LLVMBuildAdd (builder, mono_llvm_build_atomic_rmw (builder, LLVM_ATOMICRMW_OP_ADD, args [0], args [1]), args [1], dname);
if (ins->opcode == OP_ATOMIC_ADD_I4 || ins->opcode == OP_ATOMIC_ADD_I8)
// Interlocked.Add returns new value (that's why we emit additional Add here)
// see https://github.com/dotnet/runtime/pull/33102
values [ins->dreg] = LLVMBuildAdd (builder, mono_llvm_build_atomic_rmw (builder, LLVM_ATOMICRMW_OP_ADD, args [0], args [1]), args [1], dname);
else if (ins->opcode == OP_ATOMIC_AND_I4 || ins->opcode == OP_ATOMIC_AND_I8)
values [ins->dreg] = mono_llvm_build_atomic_rmw (builder, LLVM_ATOMICRMW_OP_AND, args [0], args [1]);
else if (ins->opcode == OP_ATOMIC_OR_I4 || ins->opcode == OP_ATOMIC_OR_I8)
values [ins->dreg] = mono_llvm_build_atomic_rmw (builder, LLVM_ATOMICRMW_OP_OR, args [0], args [1]);
else
g_assert_not_reached ();
ARM64_ATOMIC_FENCE_FIX;
break;
}
Expand Down
4 changes: 4 additions & 0 deletions src/mono/mono/mini/mini-ops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,6 +1119,10 @@ MINI_OP(OP_ATOMIC_STORE_R8, "atomic_store_r8", IREG, FREG, NONE)

MINI_OP(OP_ATOMIC_ADD_I4, "atomic_add_i4", IREG, IREG, IREG)
MINI_OP(OP_ATOMIC_ADD_I8, "atomic_add_i8", IREG, IREG, IREG)
MINI_OP(OP_ATOMIC_AND_I4, "atomic_and_i4", IREG, IREG, IREG)
MINI_OP(OP_ATOMIC_AND_I8, "atomic_and_i8", IREG, IREG, IREG)
MINI_OP(OP_ATOMIC_OR_I4, "atomic_or_i4", IREG, IREG, IREG)
MINI_OP(OP_ATOMIC_OR_I8, "atomic_or_i8", IREG, IREG, IREG)

MINI_OP(OP_ATOMIC_EXCHANGE_I4, "atomic_exchange_i4", IREG, IREG, IREG)
MINI_OP(OP_ATOMIC_EXCHANGE_I8, "atomic_exchange_i8", IREG, IREG, IREG)
Expand Down