add flag for structure parsing

Author: Hugobros3

include/shady/driver.h

@@ -26,8 +26,8 @@ typedef enum {
 } SourceLanguage;
 
 SourceLanguage guess_source_language(const char* filename);
-ShadyErrorCodes driver_load_source_file(SourceLanguage lang, size_t, const char* file_contents, Module* mod);
-ShadyErrorCodes driver_load_source_file_from_filename(const char* filename, Module* mod);
+ShadyErrorCodes driver_load_source_file(const CompilerConfig* config, SourceLanguage lang, size_t, const char* file_contents, Module* mod);
+ShadyErrorCodes driver_load_source_file_from_filename(const CompilerConfig* config, const char* filename, Module* mod);
 
 typedef enum {
     TgtAuto,

include/shady/ir.h

@@ -281,6 +281,7 @@ struct CompilerConfig_ {
         bool force_join_point_lifting;
         bool assume_no_physical_global_ptrs;
         bool restructure_everything;
+        bool recover_structure;
     } hacks;
 
     struct {

samples/checkerboard/checkerboard.c

@@ -69,7 +69,7 @@ int main(int argc, char **argv)
 
     IrArena* a = new_ir_arena(default_arena_config());
     Module* m = new_module(a, "checkerboard");
-    driver_load_source_file(SrcSlim, sizeof(checkerboard_kernel_src), checkerboard_kernel_src, m);
+    driver_load_source_file(&compiler_config, SrcSlim, sizeof(checkerboard_kernel_src), checkerboard_kernel_src, m);
     Program* program = new_program_from_module(runtime, &compiler_config, m);
 
     wait_completion(launch_kernel(program, device, "main", 16, 16, 1, 1, (void*[]) { &buf_addr }));

src/driver/cli.c

@@ -100,6 +100,7 @@ F(logging.print_generated, print-generated) \
 F(lower.simt_to_explicit_simd, lower-simt-to-simd) \
 F(optimisations.inline_everything, inline-everything) \
 F(hacks.restructure_everything, restructure-everything) \
+F(hacks.recover_structure, recover-structure) \
 
 void cli_parse_compiler_config_args(CompilerConfig* config, int* pargc, char** argv) {
     int argc = *pargc;

src/driver/driver.c

@@ -37,11 +37,11 @@ SourceLanguage guess_source_language(const char* filename) {
     return SrcSlim;
 }
 
-ShadyErrorCodes driver_load_source_file(SourceLanguage lang, size_t len, const char* file_contents, Module* mod) {
+ShadyErrorCodes driver_load_source_file(const CompilerConfig* config, SourceLanguage lang, size_t len, const char* file_contents, Module* mod) {
     switch (lang) {
         case SrcLLVM: {
 #ifdef LLVM_PARSER_PRESENT
-            parse_llvm_into_shady(mod, len, file_contents);
+            parse_llvm_into_shady(config, mod, len, file_contents);
 #else
             assert(false && "LLVM front-end missing in this version");
 #endif
@@ -67,7 +67,7 @@ ShadyErrorCodes driver_load_source_file(SourceLanguage lang, size_t len, const c
     return NoError;
 }
 
-ShadyErrorCodes driver_load_source_file_from_filename(const char* filename, Module* mod) {
+ShadyErrorCodes driver_load_source_file_from_filename(const CompilerConfig* config, const char* filename, Module* mod) {
     ShadyErrorCodes err;
     SourceLanguage lang = guess_source_language(filename);
     size_t len;
@@ -84,7 +84,7 @@ ShadyErrorCodes driver_load_source_file_from_filename(const char* filename, Modu
         err = InputFileDoesNotExist;
         goto exit;
     }
-    err = driver_load_source_file(lang, len, contents, mod);
+    err = driver_load_source_file(config, lang, len, contents, mod);
     exit:
     free((void*) contents);
     return err;
@@ -98,7 +98,7 @@ ShadyErrorCodes driver_load_source_files(DriverConfig* args, Module* mod) {
 
     size_t num_source_files = entries_count_list(args->input_filenames);
     for (size_t i = 0; i < num_source_files; i++) {
-        int err = driver_load_source_file_from_filename(read_list(const char*, args->input_filenames)[i], mod);
+        int err = driver_load_source_file_from_filename(&args->config, read_list(const char*, args->input_filenames)[i], mod);
         if (err)
             return err;
     }

src/driver/vcc.c

@@ -55,6 +55,8 @@ int main(int argc, char** argv) {
         .tmp_filename = NULL,
         .delete_tmp_file = true
     };
+    args.config.hacks.recover_structure = true;
+
     cli_parse_driver_arguments(&args, &argc, argv);
     cli_parse_common_args(&argc, argv);
     cli_parse_compiler_config_args(&args.config, &argc, argv);
@@ -143,7 +145,7 @@ int main(int argc, char** argv) {
         char* llvm_ir;
         if (!read_file(vcc_options.tmp_filename, &len, &llvm_ir))
             exit(InputFileIOError);
-        driver_load_source_file(SrcLLVM, len, llvm_ir, mod);
+        driver_load_source_file(&args.config, SrcLLVM, len, llvm_ir, mod);
         free(llvm_ir);
 
         if (vcc_options.delete_tmp_file)

src/frontends/llvm/l2s.c

@@ -230,7 +230,7 @@ const Node* convert_global(Parser* p, LLVMValueRef global) {
     return r;
 }
 
-bool parse_llvm_into_shady(Module* dst, size_t len, const char* data) {
+bool parse_llvm_into_shady(const CompilerConfig* config, Module* dst, size_t len, const char* data) {
     LLVMContextRef context = LLVMContextCreate();
     LLVMModuleRef src;
     LLVMMemoryBufferRef mem = LLVMCreateMemoryBufferWithMemoryRange(data, len, "my_great_buffer", false);
@@ -248,6 +248,7 @@ bool parse_llvm_into_shady(Module* dst, size_t len, const char* data) {
     Module* dirty = new_module(get_module_arena(dst), "dirty");
     Parser p = {
         .ctx = context,
+        .config = config,
         .map = new_dict(LLVMValueRef, const Node*, (HashFn) hash_opaque_ptr, (CmpFn) cmp_opaque_ptr),
         .annotations = new_dict(LLVMValueRef, ParsedAnnotation, (HashFn) hash_opaque_ptr, (CmpFn) cmp_opaque_ptr),
         .scopes = new_dict(const Node*, Nodes, (HashFn) hash_node, (CmpFn) compare_node),

src/frontends/llvm/l2s.h

@@ -4,6 +4,6 @@
 #include "shady/ir.h"
 #include <stdbool.h>
 
-bool parse_llvm_into_shady(Module* dst, size_t len, const char* data);
+bool parse_llvm_into_shady(const CompilerConfig*, Module* dst, size_t len, const char* data);
 
 #endif

src/frontends/llvm/l2s_postprocess.c

@@ -11,6 +11,7 @@
 
 typedef struct {
     Rewriter rewriter;
+    const CompilerConfig* config;
     Parser* p;
     Scope* curr_scope;
     const Node* old_fn_or_bb;
@@ -138,6 +139,8 @@ static const Node* process_op(Context* ctx, NodeClass op_class, String op_name,
             assert(src && dst);
             rewrite_node(&ctx->rewriter, dst);
 
+            if (!ctx->config->hacks.recover_structure)
+                break;
             Nodes* src_lexical_scope = find_value_dict(const Node*, Nodes, ctx->p->scopes, src);
             Nodes* dst_lexical_scope = find_value_dict(const Node*, Nodes, ctx->p->scopes, dst);
             if (!src_lexical_scope) {
@@ -251,6 +254,7 @@ void postprocess(Parser* p, Module* src, Module* dst) {
     assert(src != dst);
     Context ctx = {
         .rewriter = create_rewriter(src, dst, (RewriteNodeFn) process_node),
+        .config = p->config,
         .p = p,
         .controls = new_dict(const Node*, Controls*, (HashFn) hash_node, (CmpFn) compare_node),
     };

src/frontends/llvm/l2s_private.h

@@ -11,6 +11,7 @@
 #include <string.h>
 
 typedef struct {
+    const CompilerConfig* config;
     LLVMContextRef ctx;
     struct Dict* map;
     struct Dict* annotations;