added cli parsing for runtime options

Author: Hugobros3

include/shady/driver.h

@@ -39,8 +39,6 @@ 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

include/shady/runtime.h

@@ -11,6 +11,9 @@ typedef struct {
     bool allow_no_devices;
 } RuntimeConfig;
 
+RuntimeConfig default_runtime_config();
+void cli_parse_runtime_config(RuntimeConfig* config, int* pargc, char** argv);
+
 typedef struct Runtime_  Runtime;
 typedef struct Device_   Device;
 typedef struct Program_  Program;

samples/aobench/ao_main.c

@@ -159,16 +159,14 @@ int main(int argc, char **argv) {
     set_log_level(INFO);
     Args args = {
         .compiler_config = default_compiler_config(),
-        .runtime_config = {
-            .use_validation = true,
-            .dump_spv = true,
-        }
+        .runtime_config = default_runtime_config(),
     };
 
     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_runtime_config(&args.runtime_config, &argc, argv);
     cli_parse_common_app_arguments(&args.common_app_args, &argc, argv);
 
     bool do_host = false, do_ispc = false, do_device = false, do_all = true;

samples/checkerboard/checkerboard.c

@@ -43,13 +43,11 @@ int main(int argc, char **argv)
     set_log_level(INFO);
     CompilerConfig compiler_config = default_compiler_config();
 
-    RuntimeConfig runtime_config = (RuntimeConfig) {
-        .use_validation = true,
-        .dump_spv = true,
-    };
+    RuntimeConfig runtime_config = default_runtime_config();
 
     cli_parse_common_args(&argc, argv);
     cli_parse_compiler_config_args(&compiler_config, &argc, argv);
+    cli_parse_runtime_config(&runtime_config, &argc, argv);
 
     info_print("Shady checkerboard test starting...\n");
 

src/driver/cli.c

@@ -1,9 +1,10 @@
+#include "cli.h"
+
 #include "shady/driver.h"
 #include "shady/ir.h"
 
 #include <stdlib.h>
 #include <stdbool.h>
-#include <string.h>
 
 #include "log.h"
 #include "portability.h"
@@ -81,25 +82,18 @@ void cli_parse_common_args(int* pargc, char** argv) {
     cli_pack_remaining_args(pargc, argv);
 }
 
-#define PARSE_TOGGLE_OPTION(f, name) \
-if (strcmp(argv[i], "--no-"#name) == 0) { \
-    config->f = false; argv[i] = NULL; continue; \
-} else if (strcmp(argv[i], "--"#name) == 0) { \
-    config->f = true; argv[i] = NULL; continue; \
-}
-
-#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(logging.print_internal, print-internal) \
-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) \
-F(hacks.recover_structure, recover-structure) \
+#define COMPILER_CONFIG_TOGGLE_OPTIONS(F) \
+F(config->lower.emulate_physical_memory, emulate-physical-memory) \
+F(config->lower.emulate_generic_ptrs, emulate-generic-pointers) \
+F(config->dynamic_scheduling, dynamic-scheduling) \
+F(config->hacks.force_join_point_lifting, lift-join-points) \
+F(config->logging.print_internal, print-internal) \
+F(config->logging.print_generated, print-builtin) \
+F(config->logging.print_generated, print-generated) \
+F(config->lower.simt_to_explicit_simd, lower-simt-to-simd) \
+F(config->optimisations.inline_everything, inline-everything) \
+F(config->hacks.restructure_everything, restructure-everything) \
+F(config->hacks.recover_structure, recover-structure) \
 
 void cli_parse_compiler_config_args(CompilerConfig* config, int* pargc, char** argv) {
     int argc = *pargc;
@@ -109,7 +103,7 @@ void cli_parse_compiler_config_args(CompilerConfig* config, int* pargc, char** a
         if (argv[i] == NULL)
             continue;
 
-        TOGGLE_OPTIONS(PARSE_TOGGLE_OPTION)
+        COMPILER_CONFIG_TOGGLE_OPTIONS(PARSE_TOGGLE_OPTION)
 
         if (strcmp(argv[i], "--entry-point") == 0) {
             argv[i] = NULL;

src/driver/cli.h

@@ -0,0 +1,15 @@
+#ifndef CLI_H
+#define CLI_H
+
+#include <string.h>
+
+#define PARSE_TOGGLE_OPTION(f, name) \
+if (strcmp(argv[i], "--no-"#name) == 0) { \
+    f = false; argv[i] = NULL; continue; \
+} else if (strcmp(argv[i], "--"#name) == 0) { \
+    f = true; argv[i] = NULL; continue; \
+}
+
+void cli_pack_remaining_args(int* pargc, char** argv);
+
+#endif CLI_H

src/runtime/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(runtime runtime.c runtime_program.c)
+add_library(runtime runtime.c runtime_program.c runtime_cli.c)
 target_link_libraries(runtime PUBLIC driver)
 set_target_properties(runtime PROPERTIES OUTPUT_NAME "shady_runtime")
 

src/runtime/runtime_cli.c

@@ -0,0 +1,47 @@
+#include "runtime_private.h"
+#include "driver/cli.h"
+
+#include "common/log.h"
+
+RuntimeConfig default_runtime_config() {
+    return (RuntimeConfig) {
+#ifndef NDEBUG
+        .dump_spv = true,
+        .use_validation = true,
+#endif
+    };
+}
+
+#define DRIVER_CONFIG_OPTIONS(F) \
+F(config->use_validation, api-validation) \
+F(config->dump_spv, dump-spv) \
+
+void cli_parse_runtime_config(RuntimeConfig* config, int* pargc, char** argv) {
+    int argc = *pargc;
+
+    bool help = false;
+    for (int i = 1; i < argc; i++) {
+
+        DRIVER_CONFIG_OPTIONS(PARSE_TOGGLE_OPTION)
+
+        if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) {
+            help = true;
+            continue;
+        } else {
+            continue;
+        }
+        argv[i] = NULL;
+    }
+
+    if (help) {
+        // error_print("Usage: slim source.slim\n");
+        // error_print("Available arguments: \n");
+        error_print("  --target <c, glsl, ispc, spirv>           \n");
+        error_print("  --output <filename>, -o <filename>        \n");
+        error_print("  --dump-cfg <filename>                     Dumps the control flow graph of the final IR\n");
+        error_print("  --dump-loop-tree <filename>\n");
+        error_print("  --dump-ir <filename>                      Dumps the final IR\n");
+    }
+
+    cli_pack_remaining_args(pargc, argv);
+}

src/runtime/runtime_test.c

@@ -32,13 +32,11 @@ int main(int argc, char* argv[]) {
     set_log_level(INFO);
     Args args = {
         .driver_config = default_driver_config(),
-    };
-    args.runtime_config = (RuntimeConfig) {
-        .use_validation = true,
-        .dump_spv = true,
+        .runtime_config = default_runtime_config(),
     };
     cli_parse_common_app_arguments(&args.common_app_args, &argc, argv);
     cli_parse_common_args(&argc, argv);
+    cli_parse_runtime_config(&args.runtime_config, &argc, argv);
     cli_parse_compiler_config_args(&args.driver_config.config, &argc, argv);
     cli_parse_input_files(args.driver_config.input_filenames, &argc, argv);
 

src/shady/passes/lower_tailcalls.c

@@ -357,7 +357,7 @@ void generate_top_level_dispatch_fn(Context* ctx) {
             BodyBuilder* if_builder = begin_body(a);
             if (ctx->config->printf_trace.god_function) {
                 const Node* sid = gen_builtin_load(ctx->rewriter.dst_module, loop_body_builder, BuiltinSubgroupId);
-                bind_instruction(if_builder, prim_op(a, (PrimOp) { .op = debug_printf_op, .operands = mk_nodes(a, string_lit(a, (StringLiteral) { .string = "trace: thread %d:%d will run fn %d with mask = %lx\n" }), sid, local_id, fn_lit, next_mask) }));
+                bind_instruction(if_builder, prim_op(a, (PrimOp) { .op = debug_printf_op, .operands = mk_nodes(a, string_lit(a, (StringLiteral) { .string = "trace: thread %d:%d will run fn %ul with mask = %lx\n" }), sid, local_id, fn_lit, next_mask) }));
             }
             bind_instruction(if_builder, call(a, (Call) {
                 .callee = fn_addr_helper(a, find_processed(&ctx->rewriter, decl)),