added --restructure-everything hack

Author: Hugobros3

include/shady/ir.h

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

samples/aobench/ao_main.c

@@ -147,6 +147,8 @@ int main(int argc, char **argv) {
         }
     };
 
+    args.compiler_config.hacks.restructure_everything = true;
+
     cli_parse_common_args(&argc, argv);
     cli_parse_compiler_config_args(&args.compiler_config, &argc, argv);
     cli_parse_common_app_arguments(&args.common_app_args, &argc, argv);

src/driver/cli.c

@@ -99,6 +99,7 @@ F(logging.print_generated, print-builtin) \
 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) \
 
 void cli_parse_compiler_config_args(CompilerConfig* config, int* pargc, char** argv) {
     int argc = *pargc;

src/shady/passes/reconvergence_heuristics.c

@@ -18,6 +18,7 @@
 
 typedef struct Context_ {
     Rewriter rewriter;
+    const CompilerConfig* config;
     const Node* current_fn;
     const Node* current_abstraction;
     Scope* fwd_scope;
@@ -320,11 +321,11 @@ static const Node* process_node(Context* ctx, const Node* node) {
         }
         case Case_TAG:
         case BasicBlock_TAG:
-            if (!ctx->current_fn || !lookup_annotation(ctx->current_fn, "Restructure"))
+            if (!ctx->current_fn || !(lookup_annotation(ctx->current_fn, "Restructure") || ctx->config->hacks.restructure_everything))
                 break;
             return process_abstraction(ctx, node);
         case Branch_TAG: {
-            if (!ctx->current_fn || !lookup_annotation(ctx->current_fn, "Restructure"))
+            if (!ctx->current_fn || !(lookup_annotation(ctx->current_fn, "Restructure") || ctx->config->hacks.restructure_everything))
                 break;
             assert(ctx->fwd_scope);
 
@@ -469,13 +470,14 @@ static const Node* process_node(Context* ctx, const Node* node) {
     return recreate_node_identity(rewriter, node);
 }
 
-Module* reconvergence_heuristics(SHADY_UNUSED const CompilerConfig* config, Module* src) {
+Module* reconvergence_heuristics(const CompilerConfig* config, Module* src) {
     ArenaConfig aconfig = get_arena_config(get_module_arena(src));
     IrArena* a = new_ir_arena(aconfig);
     Module* dst = new_module(a, get_module_name(src));
 
     Context ctx = {
         .rewriter = create_rewriter(src, dst, (RewriteNodeFn) process_node),
+        .config = config,
         .current_fn = NULL,
         .fwd_scope = NULL,
         .back_scope = NULL,