added option to toggle generic ptr emulation, made LEA smarter

Author: Hugobros3

src/driver/cli.c

@@ -90,6 +90,7 @@ if (strcmp(argv[i], "--no-"#name) == 0) { \
 
 #define TOGGLE_OPTIONS(F) \
 F(lower.emulate_physical_memory, emulate-physical-memory) \
+F(lower.emulate_generic_ptrs, emulate-generic-pointers) \
 F(dynamic_scheduling, dynamic-scheduling) \
 F(hacks.force_join_point_lifting, lift-join-points) \
 F(hacks.assume_no_physical_global_ptrs, assume-no-physical-global-ptrs) \

src/driver/driver.c

@@ -33,7 +33,7 @@ SourceLanguage guess_source_language(const char* filename) {
     else if (string_ends_with(filename, ".slim"))
         return SrcShadyIR;
 
-    warn_print("unknown filename extension '%s', interpreting as Slim sourcecode by default.");
+    warn_print("unknown filename extension '%s', interpreting as Slim sourcecode by default.", filename);
     return SrcSlim;
 }
 

src/shady/compile.c

@@ -122,9 +122,7 @@ CompilationResult run_compiler_passes(CompilerConfig* config, Module** pmod) {
         RUN_PASS(lower_alloca)
     }
     RUN_PASS(lower_stack)
-    if (config->lower.emulate_physical_memory) {
-        RUN_PASS(lower_lea)
-    }
+    RUN_PASS(lower_lea)
     RUN_PASS(lower_generic_globals)
     if (config->lower.emulate_generic_ptrs) {
         RUN_PASS(lower_generic_ptrs)

src/shady/passes/lower_lea.c

@@ -7,11 +7,13 @@
 
 #include "log.h"
 #include "portability.h"
+#include "shady/ir.h"
 
 #include <assert.h>
 
 typedef struct {
     Rewriter rewriter;
+    const CompilerConfig* config;
 } Context;
 
 static const Node* lower_ptr_arithm(Context* ctx, BodyBuilder* bb, const Type* pointer_type, const Node* base, const Node* offset, size_t n_indices, const Node** indices) {
@@ -105,8 +107,11 @@ static const Node* process(Context* ctx, const Node* old) {
                     assert(old_base_ptr_t->tag == PtrType_TAG);
                     const Node* old_result_t = old->type;
                     deconstruct_qualified_type(&old_result_t);
-                    // Leave logical ptrs alone
-                    if (!is_physical_as(old_base_ptr_t->payload.ptr_type.address_space))
+                    bool must_lower = false;
+                    // we have to lower generic pointers if we emulate them using ints
+                    must_lower |= ctx->config->lower.emulate_generic_ptrs && old_base_ptr_t->payload.ptr_type.address_space == AsGeneric;
+                    must_lower |= ctx->config->lower.emulate_physical_memory && is_physical_as(old_base_ptr_t->payload.ptr_type.address_space);
+                    if (!must_lower)
                         break;
                     BodyBuilder* bb = begin_body(a);
                     Nodes new_ops = rewrite_nodes(&ctx->rewriter, old_ops);
@@ -132,7 +137,8 @@ Module* lower_lea(const CompilerConfig* config, Module* 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)
+        .rewriter = create_rewriter(src, dst, (RewriteNodeFn) process),
+        .config = config,
     };
     rewrite_module(&ctx.rewriter);
     destroy_rewriter(&ctx.rewriter);