misc cleanup

Author: Hugobros3

include/shady/driver.h

@@ -39,6 +39,8 @@ typedef enum {
 
 CodegenTarget guess_target(const char* filename);
 
+void cli_pack_remaining_args(int* pargc, char** argv);
+
 // parses 'common' arguments such as log level etc
 void cli_parse_common_args(int* pargc, char** argv);
 // parses compiler pipeline options

samples/aobench/ao_main.c

@@ -146,10 +146,9 @@ void render_device(Args* args, TEXEL_T *img, int w, int h, int nsubsamples, Stri
     uint64_t tpn = timespec_to_nano(tp);
     info_print("device rendering took %dus (gpu time: %dus)\n", (tpn - tsn) / 1000, profiled_gpu_time / 1000);
 
-    debug_print("data %d\n", (int) img[0]);
-
     if (!import_memory)
         copy_from_buffer(buf, 0, img, sizeof(*img) * WIDTH * HEIGHT * 3);
+    debug_print("data %d\n", (int) img[0]);
     destroy_buffer(buf);
 
     shutdown_runtime(runtime);

src/common/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(common STATIC list.c dict.c log.c portability.c util.c growy.c arena.c printer.c)
+add_library(common list.c dict.c log.c portability.c util.c growy.c arena.c printer.c)
 target_link_libraries(common PRIVATE "$<BUILD_INTERFACE:murmur3>")
 set_property(TARGET common PROPERTY POSITION_INDEPENDENT_CODE ON)
 

src/shady/node.c

@@ -17,10 +17,10 @@ String get_value_name(const Node* v) {
 
 String get_value_name_safe(const Node* v) {
     String name = get_value_name(v);
-    if (name)
+    if (name && strlen(name) > 0)
         return name;
     if (v->tag == Variable_TAG)
-        return format_string_interned(v->arena, "v%d", v->id);
+        return format_string_interned(v->arena, "%%%d", v->id);
     return node_tags[v->tag];
 }
 

src/shady/passes/lift_indirect_targets.c

@@ -100,14 +100,13 @@ static LiftedCont* lambda_lift(Context* ctx, const Node* cont, String given_name
     CFNodeVariables* node_vars = *find_value_dict(CFNode*, CFNodeVariables*, ctx->scope_vars, cf_node);
     struct List* recover_context = new_list(const Node*);
 
-    // add_to_recover_context(recover_context, node_vars->free_set, cont);
     add_to_recover_context(recover_context, node_vars->bound_set, cont);
     size_t recover_context_size = entries_count_list(recover_context);
 
     debugv_print("lambda_lift: free (to-be-spilled) variables at '%s' (count=%d): ", name, recover_context_size);
     for (size_t i = 0; i < recover_context_size; i++) {
         const Node* item = read_list(const Node*, recover_context)[i];
-        debugv_print(get_value_name_safe(item));
+        debugv_print("%s %%%d", get_value_name(item) ? get_value_name(item) : "", item->id);
         if (i + 1 < recover_context_size)
             debugv_print(", ");
     }
@@ -122,13 +121,7 @@ static LiftedCont* lambda_lift(Context* ctx, const Node* cont, String given_name
     insert_dict(const Node*, LiftedCont*, ctx->lifted, cont, lifted_cont);
 
     Context lifting_ctx = *ctx;
-    // struct Dict* old_map = lifting_ctx.rewriter.map;
-    // lifting_ctx.rewriter.map = clone_dict(lifting_ctx.rewriter.map);
-
-    // lifting_ctx.rewriter = create_rewriter(ctx->rewriter.src_module, ctx->rewriter.dst_module, (RewriteNodeFn) process_node);
-    // lifting_ctx.rewriter.decls_map = NULL;
-    lifting_ctx.rewriter.map = new_dict(const Node*, Node*, (HashFn) hash_node, (CmpFn) compare_node);
-    lifting_ctx.rewriter.parent = &ctx->rewriter;
+    lifting_ctx.rewriter = create_children_rewriter(&ctx->rewriter);
     register_processed_list(&lifting_ctx.rewriter, oparams, new_params);
 
     const Node* payload = var(a, qualified_type_helper(uint32_type(a), false), "sp");
@@ -160,9 +153,7 @@ static LiftedCont* lambda_lift(Context* ctx, const Node* cont, String given_name
     }
 
     const Node* substituted = rewrite_node(&lifting_ctx.rewriter, obody);
-    //destroy_dict(lifting_ctx.rewriter.processed);
     destroy_rewriter(&lifting_ctx.rewriter);
-    // lifting_ctx.rewriter.map = old_map;
 
     assert(is_terminator(substituted));
     new_fn->payload.fun.body = finish_body(bb, substituted);

src/shady/rewrite.c

@@ -50,6 +50,13 @@ Module* rebuild_module(Module* src) {
     return dst;
 }
 
+Rewriter create_children_rewriter(Rewriter* parent) {
+    Rewriter r = *parent;
+    r.map = new_dict(const Node*, Node*, (HashFn) hash_node, (CmpFn) compare_node);
+    r.parent = parent;
+    return r;
+}
+
 const Node* rewrite_node_with_fn(Rewriter* rewriter, const Node* node, RewriteNodeFn fn) {
     assert(rewriter->rewrite_fn);
     if (!node)

src/shady/rewrite.h

@@ -48,6 +48,8 @@ Rewriter create_rewriter(Module* src, Module* dst, RewriteNodeFn fn);
 Rewriter create_importer(Module* src, Module* dst);
 Module* rebuild_module(Module*);
 Rewriter create_substituter(Module* arena);
+
+Rewriter create_children_rewriter(Rewriter* parent);
 void destroy_rewriter(Rewriter*);
 
 void rewrite_module(Rewriter*);