authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-05-04 18:34:17-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-05-04 18:34:17-07:00
logdedde0d790a60522e073d78ce6bbb0714d50d7aa
tree4b5c8fe9440dcc8a8da7d8e5644874b9cb483007
parentc95e49785772a54916418630fbc7283791a4aa72

add fence builtin function

5 files changed, 58 insertions(+), 5 deletions(-)

src/all_types.hpp+2-1
......@@ -1116,6 +1116,7 @@ enum BuiltinFnId {
11161116 BuiltinFnIdBreakpoint,
11171117 BuiltinFnIdEmbedFile,
11181118 BuiltinFnIdCmpExchange,
1119 BuiltinFnIdFence,
11191120};
11201121
11211122struct BuiltinFnEntry {
......@@ -1184,7 +1185,7 @@ struct CodeGen {
11841185 TypeTableEntry *entry_os_enum;
11851186 TypeTableEntry *entry_arch_enum;
11861187 TypeTableEntry *entry_environ_enum;
1187 TypeTableEntry *entry_mem_order_enum;
1188 TypeTableEntry *entry_atomic_order_enum;
11881189 } builtin_types;
11891190
11901191 ZigTarget zig_target;
src/analyze.cpp+29-2
......@@ -4417,6 +4417,8 @@ static TypeTableEntry *analyze_embed_file(CodeGen *g, ImportTableEntry *import,
44174417static TypeTableEntry *analyze_cmpxchg(CodeGen *g, ImportTableEntry *import,
44184418 BlockContext *context, AstNode *node)
44194419{
4420 assert(node->type == NodeTypeFnCallExpr);
4421
44204422 AstNode **ptr_arg = &node->data.fn_call_expr.params.at(0);
44214423 AstNode **cmp_arg = &node->data.fn_call_expr.params.at(1);
44224424 AstNode **new_arg = &node->data.fn_call_expr.params.at(2);
......@@ -4437,9 +4439,9 @@ static TypeTableEntry *analyze_cmpxchg(CodeGen *g, ImportTableEntry *import,
44374439 TypeTableEntry *new_type = analyze_expression(g, import, context, child_type, *new_arg);
44384440
44394441 TypeTableEntry *success_order_type = analyze_expression(g, import, context,
4440 g->builtin_types.entry_mem_order_enum, *success_order_arg);
4442 g->builtin_types.entry_atomic_order_enum, *success_order_arg);
44414443 TypeTableEntry *failure_order_type = analyze_expression(g, import, context,
4442 g->builtin_types.entry_mem_order_enum, *failure_order_arg);
4444 g->builtin_types.entry_atomic_order_enum, *failure_order_arg);
44434445
44444446 if (cmp_type->id == TypeTableEntryIdInvalid ||
44454447 new_type->id == TypeTableEntryIdInvalid ||
......@@ -4485,6 +4487,29 @@ static TypeTableEntry *analyze_cmpxchg(CodeGen *g, ImportTableEntry *import,
44854487 return g->builtin_types.entry_bool;
44864488}
44874489
4490static TypeTableEntry *analyze_fence(CodeGen *g, ImportTableEntry *import,
4491 BlockContext *context, AstNode *node)
4492{
4493 assert(node->type == NodeTypeFnCallExpr);
4494
4495 AstNode **atomic_order_arg = &node->data.fn_call_expr.params.at(0);
4496 TypeTableEntry *atomic_order_type = analyze_expression(g, import, context,
4497 g->builtin_types.entry_atomic_order_enum, *atomic_order_arg);
4498
4499 if (atomic_order_type->id == TypeTableEntryIdInvalid) {
4500 return g->builtin_types.entry_invalid;
4501 }
4502
4503 ConstExprValue *atomic_order_val = &get_resolved_expr(*atomic_order_arg)->const_val;
4504
4505 if (!atomic_order_val->ok) {
4506 add_node_error(g, *atomic_order_arg, buf_sprintf("unable to evaluate constant expression"));
4507 return g->builtin_types.entry_invalid;
4508 }
4509
4510 return g->builtin_types.entry_void;
4511}
4512
44884513static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry *import, BlockContext *context,
44894514 TypeTableEntry *expected_type, AstNode *node)
44904515{
......@@ -4823,6 +4848,8 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry
48234848 return analyze_embed_file(g, import, context, node);
48244849 case BuiltinFnIdCmpExchange:
48254850 return analyze_cmpxchg(g, import, context, node);
4851 case BuiltinFnIdFence:
4852 return analyze_fence(g, import, context, node);
48264853 }
48274854 zig_unreachable();
48284855}
src/codegen.cpp+18-2
......@@ -441,6 +441,20 @@ static LLVMValueRef gen_cmp_exchange(CodeGen *g, AstNode *node) {
441441 return LLVMBuildExtractValue(g->builder, result_val, 1, "");
442442}
443443
444static LLVMValueRef gen_fence(CodeGen *g, AstNode *node) {
445 assert(node->type == NodeTypeFnCallExpr);
446
447 AstNode *atomic_order_arg = node->data.fn_call_expr.params.at(0);
448 ConstExprValue *atomic_order_val = &get_resolved_expr(atomic_order_arg)->const_val;
449
450 assert(atomic_order_val->ok);
451
452 LLVMAtomicOrdering atomic_order = to_LLVMAtomicOrdering((AtomicOrder)atomic_order_val->data.x_enum.tag);
453
454 LLVMBuildFence(g->builder, atomic_order, false, "");
455 return nullptr;
456}
457
444458static LLVMValueRef gen_builtin_fn_call_expr(CodeGen *g, AstNode *node) {
445459 assert(node->type == NodeTypeFnCallExpr);
446460 AstNode *fn_ref_expr = node->data.fn_call_expr.fn_ref_expr;
......@@ -588,6 +602,8 @@ static LLVMValueRef gen_builtin_fn_call_expr(CodeGen *g, AstNode *node) {
588602 return LLVMBuildCall(g->builder, g->trap_fn_val, nullptr, 0, "");
589603 case BuiltinFnIdCmpExchange:
590604 return gen_cmp_exchange(g, node);
605 case BuiltinFnIdFence:
606 return gen_fence(g, node);
591607 }
592608 zig_unreachable();
593609}
......@@ -4139,7 +4155,7 @@ static void define_builtin_types(CodeGen *g) {
41394155 TypeTableEntry *tag_type_entry = get_smallest_unsigned_int_type(g, field_count);
41404156 entry->data.enumeration.tag_type = tag_type_entry;
41414157
4142 g->builtin_types.entry_mem_order_enum = entry;
4158 g->builtin_types.entry_atomic_order_enum = entry;
41434159 g->primitive_type_table.put(&entry->name, entry);
41444160 }
41454161}
......@@ -4241,7 +4257,7 @@ static void define_builtin_fns(CodeGen *g) {
42414257 create_builtin_fn_with_arg_count(g, BuiltinFnIdErrName, "err_name", 1);
42424258 create_builtin_fn_with_arg_count(g, BuiltinFnIdEmbedFile, "embed_file", 1);
42434259 create_builtin_fn_with_arg_count(g, BuiltinFnIdCmpExchange, "cmpxchg", 5);
4244 //create_builtin_fn_with_arg_count(g, BuiltinFnIdAtomicRmw, "atomicrmw", 1);
4260 create_builtin_fn_with_arg_count(g, BuiltinFnIdFence, "fence", 1);
42454261}
42464262
42474263static void init(CodeGen *g, Buf *source_path) {
src/eval.cpp+2
......@@ -687,6 +687,8 @@ static bool eval_fn_call_builtin(EvalFn *ef, AstNode *node, ConstExprValue *out_
687687 return eval_fn_with_overflow(ef, node, out_val, bignum_add);
688688 case BuiltinFnIdSubWithOverflow:
689689 return eval_fn_with_overflow(ef, node, out_val, bignum_sub);
690 case BuiltinFnIdFence:
691 return false;
690692 case BuiltinFnIdMemcpy:
691693 case BuiltinFnIdMemset:
692694 case BuiltinFnIdSizeof:
test/self_hosted.zig+7
......@@ -1449,3 +1449,10 @@ fn cmpxchg() {
14491449 while (!@cmpxchg(&x, 1234, 5678, AtomicOrder.SeqCst, AtomicOrder.SeqCst)) {}
14501450 assert(x == 5678);
14511451}
1452
1453#attribute("test")
1454fn fence() {
1455 var x: i32 = 1234;
1456 @fence(AtomicOrder.SeqCst);
1457 x = 5678;
1458}