Skip to content
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

Merge implementation of LVars #206

Open
wants to merge 15 commits into
base: feature/thread
Choose a base branch
from
Open

Merge implementation of LVars #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d6d7297
LVar: update C implementation
cyberglot Sep 21, 2021
0d7d683
LVar: add comments, fix headers, etc in the C implementation
cyberglot Sep 21, 2021
1c58ad2
LVar: add comments, fix headers, etc in the C implementation
cyberglot Sep 21, 2021
d57d649
LVar: update koka interface to LVars
cyberglot Sep 21, 2021
e5fc6fe
LVar: fix C implementation, Koka interface and add first coherence test
cyberglot Sep 22, 2021
44923b3
LVar: initial work on proper threshold sets
cyberglot Sep 23, 2021
dcdd5fc
LVars: add file for LVars and generalize update/join function in C
cyberglot Sep 24, 2021
3ccf136
LVars: fix get in C and add new lvar test
cyberglot Sep 24, 2021
9cdc9f7
LVars: updated semantics of get and put
cyberglot Sep 25, 2021
6c8d8f7
LVars: make it compile again
cyberglot Sep 26, 2021
b6c4947
LVar: update first example
cyberglot Oct 16, 2021
507f881
LVar: put now can throw an error
cyberglot Oct 16, 2021
4144b6a
LVar: update code in C
cyberglot Oct 16, 2021
44c09bd
LVar: add some comments to the C imp
cyberglot Oct 17, 2021
4b21161
LVar: add comments to the low-level Koka impl
cyberglot Oct 17, 2021
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
28 changes: 14 additions & 14 deletions kklib/include/kklib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef KKLIB_H
#define KKLIB_H

#define KKLIB_BUILD 48 // modify on changes to trigger recompilation
#define KKLIB_BUILD 99 // modify on changes to trigger recompilation
#define KK_MULTI_THREADED 1 // set to 0 to be used single threaded only
// #define KK_DEBUG_FULL 1

Expand Down Expand Up @@ -305,7 +305,7 @@ typedef struct kk_yield_s {

extern kk_ptr_t kk_evv_empty_singleton;


// The thread local context.
// The fields `yielding`, `heap` and `evv` should come first for efficiency
typedef struct kk_context_s {
Expand All @@ -323,7 +323,7 @@ typedef struct kk_context_s {
kk_task_group_t* task_group; // task group for managing threads. NULL for the main thread.

struct kk_random_ctx_s* srandom_ctx; // strong random using chacha20, initialized on demand
kk_ssize_t argc; // command line argument count
kk_ssize_t argc; // command line argument count
const char** argv; // command line arguments
kk_timer_t process_start; // time at start of the process
int64_t timer_freq; // high precision timer frequency
Expand Down Expand Up @@ -383,7 +383,7 @@ kk_decl_export void kk_box_mark_shared( kk_box_t b, kk_context_t* ctx );
#else
static inline void* kk_malloc_small(kk_ssize_t sz, kk_context_t* ctx) {
return mi_heap_malloc_small(ctx->heap, (size_t)sz);
}
}
#endif

static inline void* kk_malloc(kk_ssize_t sz, kk_context_t* ctx) {
Expand Down Expand Up @@ -443,7 +443,7 @@ static inline void kk_block_init(kk_block_t* b, kk_ssize_t size, kk_ssize_t scan
kk_assert_internal(scan_fsize >= 0 && scan_fsize < KK_SCAN_FSIZE_MAX);
#if (KK_ARCH_LITTLE_ENDIAN)
// explicit shifts lead to better codegen
*((uint64_t*)b) = ((uint64_t)scan_fsize | (uint64_t)tag << 16);
*((uint64_t*)b) = ((uint64_t)scan_fsize | (uint64_t)tag << 16);
#else
kk_header_t header = { (uint8_t)scan_fsize, 0, (uint16_t)tag, 0 };
b->header = header;
Expand Down Expand Up @@ -553,7 +553,7 @@ static inline void kk_block_drop(kk_block_t* b, kk_context_t* ctx) {

static inline void kk_block_decref(kk_block_t* b, kk_context_t* ctx) {
kk_assert_internal(kk_block_is_valid(b));
const uint32_t rc = b->header.refcount;
const uint32_t rc = b->header.refcount;
if (kk_likely((int32_t)(rc > 0))) { // note: assume two's complement
b->header.refcount = rc - 1;
}
Expand All @@ -578,7 +578,7 @@ static inline kk_reuse_t kk_block_drop_reuse(kk_block_t* b, kk_context_t* ctx) {

static inline void kk_box_drop(kk_box_t b, kk_context_t* ctx);

// Drop with inlined dropping of children
// Drop with inlined dropping of children
static inline void kk_block_dropi(kk_block_t* b, kk_context_t* ctx) {
kk_assert_internal(kk_block_is_valid(b));
const uint32_t rc = b->header.refcount;
Expand All @@ -590,7 +590,7 @@ static inline void kk_block_dropi(kk_block_t* b, kk_context_t* ctx) {
kk_block_free(b);
}
else if (kk_unlikely((int32_t)rc < 0)) { // note: assume two's complement
kk_block_check_drop(b, rc, ctx); // thread-share or sticky (overflowed) ?
kk_block_check_drop(b, rc, ctx); // thread-share or sticky (overflowed) ?
}
else {
b->header.refcount = rc-1;
Expand All @@ -614,7 +614,7 @@ static inline kk_reuse_t kk_block_dropi_reuse(kk_block_t* b, kk_context_t* ctx)
}
}

// Drop with known scan size
// Drop with known scan size
static inline void kk_block_dropn(kk_block_t* b, kk_ssize_t scan_fsize, kk_context_t* ctx) {
kk_assert_internal(kk_block_is_valid(b));
const uint32_t rc = b->header.refcount;
Expand All @@ -639,7 +639,7 @@ static inline void kk_block_dropn(kk_block_t* b, kk_ssize_t scan_fsize, kk_conte
static inline kk_reuse_t kk_block_dropn_reuse(kk_block_t* b, kk_ssize_t scan_fsize, kk_context_t* ctx) {
kk_assert_internal(kk_block_is_valid(b));
const uint32_t rc = b->header.refcount;
if (rc == 0) {
if (rc == 0) {
kk_assert_internal(kk_block_scan_fsize(b) == scan_fsize);
for (kk_ssize_t i = 0; i < scan_fsize; i++) {
kk_box_drop(kk_block_field(b, i), ctx);
Expand Down Expand Up @@ -755,7 +755,7 @@ static inline kk_tag_t kk_datatype_tag(kk_datatype_t d) {

static inline bool kk_datatype_has_tag(kk_datatype_t d, kk_tag_t t) {
if (kk_datatype_is_ptr(d)) {
return (kk_block_tag(d.ptr) == t);
return (kk_block_tag(d.ptr) == t);
}
else {
return (d.singleton == kk_datatype_from_tag(t).singleton);
Expand Down Expand Up @@ -926,7 +926,7 @@ static inline kk_value_tag_t kk_value_tag(kk_uintx_t tag) {
return kk_integer_from_small((kk_intx_t)tag);
}
*/
#define kk_value_tag(tag) (kk_integer_from_small(tag))
#define kk_value_tag(tag) (kk_integer_from_small(tag))

/*--------------------------------------------------------------------------------------
Functions
Expand Down Expand Up @@ -1065,7 +1065,7 @@ static inline kk_vector_t kk_vector_unbox(kk_box_t v, kk_context_t* ctx) {
}



/*--------------------------------------------------------------------------------------
References
--------------------------------------------------------------------------------------*/
Expand Down Expand Up @@ -1113,7 +1113,7 @@ static inline kk_box_t kk_ref_get(kk_ref_t r, kk_context_t* ctx) {
else {
// thread shared
return kk_ref_get_thread_shared(r,ctx);
}
}
}

static inline kk_box_t kk_ref_swap_borrow(kk_ref_t r, kk_box_t value) {
Expand Down
9 changes: 5 additions & 4 deletions kklib/include/kklib/thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once
#include <sys/_types/_int32_t.h>
#ifndef KK_THREAD_H
#define KK_THREAD_H
/*---------------------------------------------------------------------------
Expand Down Expand Up @@ -31,9 +32,9 @@ kk_decl_export kk_promise_t kk_task_schedule_n( kk_ssize_t count, kk_ssize_t str
--------------------------------------------------------------------------------------*/
typedef kk_box_t kk_lvar_t;

kk_decl_export kk_lvar_t kk_lvar_alloc( kk_box_t init, kk_context_t* ctx );
kk_decl_export void kk_lvar_put( kk_lvar_t lvar, kk_box_t val, kk_function_t monotonic_combine, kk_context_t* ctx );
kk_decl_export kk_box_t kk_lvar_get( kk_lvar_t lvar, kk_box_t bot, kk_function_t is_gte, kk_context_t* ctx );

kk_decl_export kk_lvar_t kk_lvar_alloc(kk_box_t lattice_bottom, kk_context_t *ctx);
kk_decl_export int32_t kk_lvar_put(kk_lvar_t lvar, kk_function_t update, kk_context_t *ctx);
kk_decl_export kk_box_t kk_lvar_get( kk_lvar_t lvar, kk_function_t in_threshold_set, kk_context_t* ctx );
kk_decl_export kk_box_t kk_lvar_freeze(kk_lvar_t lvar, kk_context_t *ctx);

#endif // include guard
Loading