sync changes

Author: ValKmjolnir

godel-script/godel-frontend/src/ast/expr.h

@@ -306,8 +306,9 @@ class call_head: public expr {
     func_call* call;
     initializer* ini;
 
+private:
     // mark schema(xxx) is schema::__all__(xxx)
-    bool schema_loader;
+    bool flag_is_schema_loader;
 
 private:
     void check_call_and_init() {
@@ -321,20 +322,22 @@ class call_head: public expr {
     call_head(const span& location):
         expr(ast_class::ac_call_head, location),
         first(nullptr), call(nullptr), ini(nullptr),
-        schema_loader(false) {}
+        flag_is_schema_loader(false) {}
     ~call_head() override;
     void set_first_expression(expr* node) { first = node; }
     void set_func_call(func_call* node) { call = node; check_call_and_init(); }
     void set_initializer(initializer* node) { ini = node; check_call_and_init(); }
-    void set_is_schema_loader() { schema_loader = true; }
+    void set_is_schema_loader() { flag_is_schema_loader = true; }
 
+public:
     expr* get_first_expression() { return first; }
     bool has_func_call() const { return call!=nullptr; }
     func_call* get_func_call() { return call; }
     bool is_initializer() const { return ini!=nullptr; }
     initializer* get_initializer() { return ini; }
-    bool is_schema_loader() const { return schema_loader; }
+    bool is_schema_loader() const { return flag_is_schema_loader; }
 
+public:
     void accept(ast_visitor* visitor) override;
 };
 

godel-script/godel-frontend/src/cli.cpp

@@ -42,18 +42,20 @@ std::ostream& help(std::ostream& out) {
     << reset << "\nUsage: ./godel "
     << green << "[options] <input>\n\n"
     << reset << "Compile options:\n"
+    << green << "  -###                              "
+    << reset << "Print detailed compilation commands (not run).\n"
     << green << "  -s,   --souffle <path>            "
     << reset << "Output generated souffle to file.\n"
     << green << "  -r,   --run-souffle               "
-    << reset << "Run compiled godel script program directly.\n"
+    << reset << "Run compiled godel script program.\n"
     << green << "  -p,   --package-path <path>       "
     << reset << "Give godelscript package root path.\n"
     << green << "  -f,   --fact                      "
     << reset << "Specify souffle fact data path.\n"
     << green << "  -e,   --extract-template          "
     << reset << "Extract probable script template.\n"
     << green << "  -l,   --location-extract <path>   "
-    << reset << "Extract all functions and methods location into json.\n";
+    << reset << "Extract function and method location into json.\n";
     out
     << reset << "\nInformation dump options:\n"
     << green << "  -h,   --help                      "
@@ -81,7 +83,9 @@ std::ostream& help(std::ostream& out) {
     << green << "        --dump-lsp                  "
     << reset << "Show semantic result in json format.\n"
     << green << "        --lsp-dump-use-indexed-file "
-    << reset << "Use file index instead of string.\n";
+    << reset << "Use file index instead of string.\n"
+    << green << "        --lsp-dump-only-schema      "
+    << reset << "Only dump schema without location.\n";
     out
     << reset << "\nLexical analysis dump options:\n"
     << green << "        --lexer-dump-token          "
@@ -93,25 +97,33 @@ std::ostream& help(std::ostream& out) {
     << green << "        --semantic-only             "
     << reset << "Only do semantic analysis and exit.\n"
     << green << "        --semantic-pub-check        "
-    << reset << "Enable semantic public access authority checker.\n"
-    << green << "        --semantic-no-else          "
-    << reset << "Enable semantic no else branch checker.\n";
+    << reset << "Enable semantic public access authority checker.\n";
     out
     << reset << "\nSouffle code generation options:\n"
+    << green << "  -O1                               "
+    << reset << "Enable souffle code generator optimizer, level 1.\n"
+    << green << "  -O2                               "
+    << reset << "Enable souffle code generator optimizer, level 2.\n"
+    << green << "  -O3                               "
+    << reset << "Enable souffle code generator optimizer, level 3.\n"
     << green << "  -Of,  --opt-for                   "
     << reset << "Enable souffle code generator for statement optimizer.\n"
     << green << "  -Ol,  --opt-let                   "
     << reset << "Enable souffle code generator let statement optimizer(not suggested).\n"
     << green << "  -Oim, --opt-ir-merge              "
-    << reset << "Enable souffle inst combine pass (Experimental).\n"
+    << reset << "Enable souffle inst combine pass.\n"
     << green << "  -Osc, --opt-self-constraint       "
     << reset << "Enable self data constraint optimizer in souffle code generator.\n"
+    << green << "  -Ojr, --opt-join-reorder          "
+    << reset << "Enable join reorder optimizer(experimental).\n"
     << green << "        --disable-remove-unused     "
     << reset << "Disable unused method deletion pass.\n"
     << green << "        --disable-do-schema-opt     "
     << reset << "Disable DO Schema data constraint __all__ method optimization.\n"
     << green << "        --souffle-debug             "
-    << reset << "Dump generated souffle code by stdout.\n"
+    << reset << "Dump generated souffle code by stdout.\n";
+    out
+    << reset << "\nSouffle execution options:\n"
     << green << "        --souffle-slow-transformers "
     << reset << "Enable Souffle slow transformers.\n"
     << green << "        --enable-souffle-profiling  "
@@ -125,7 +137,9 @@ std::ostream& help(std::ostream& out) {
     << green << "        --output-csv    <path>      "
     << reset << "Redirect stdout souffle execution result into csv.\n"
     << green << "        --output-sqlite <path>      "
-    << reset << "Redirect stdout souffle execution result into sqlite.\n";
+    << reset << "Redirect stdout souffle execution result into sqlite.\n"
+    << green << "  -Drs, --directly-run-souffle      "
+    << reset << "Directly run input souffle source.\n";
 
     out << "\n";
     return out;
@@ -168,16 +182,64 @@ void report_invalid_argument(const std::string& arg) {
     report::error().fatal(info);
 }
 
+void dump_configure(const configure& conf) {
+    if (conf.empty()) {
+        return;
+    }
+
+    std::unordered_map<option, std::string> mapper = {
+        {option::cli_executable_path, "executable"},
+        {option::cli_input_path, "input-script"}
+    };
+
+    for(const auto& i : settings) {
+        if (mapper.count(i.second.command_type) &&
+            mapper.at(i.second.command_type).length()>i.first.length()) {
+            continue;
+        }
+        mapper[i.second.command_type] = i.first;
+    }
+    for(const auto& i : options) {
+        if (mapper.count(i.second) &&
+            mapper.at(i.second).length()>i.first.length()) {
+            continue;
+        }
+        mapper[i.second] = i.first;
+    }
+
+    std::clog << conf.at(option::cli_executable_path) << " ";
+    std::clog << conf.at(option::cli_input_path);
+    for(const auto& i : mapper) {
+        if (i.first == option::cli_executable_path ||
+            i.first == option::cli_input_path) {
+            continue;
+        }
+        if (!conf.count(i.first)) {
+            continue;
+        }
+        std::clog << " " << i.second;
+        if (conf.at(i.first).length()) {
+            std::clog << " " << conf.at(i.first);
+        }
+    }
+    std::clog << "\n\n";
+}
+
 configure process_args(const std::vector<std::string>& vec) {
     configure config = {
-        {option::cli_executable_path, vec[0]} // load executable path here
+        // load executable path here
+        { option::cli_executable_path, vec[0] }
     };
 
     report::error err;
     for(size_t i = 1; i<vec.size(); ++i) {
         const auto& arg = vec[i];
         if (options.count(arg)) {
             config[options.at(arg)] = "";
+        } else if (multi_options.count(arg)) {
+            for(auto o : multi_options.at(arg)) {
+                config[o] = "";
+            }
         } else if (settings.count(arg)) {
             ++i;
             if (i>=vec.size() || vec[i][0]=='-') {
@@ -213,6 +275,11 @@ configure process_args(const std::vector<std::string>& vec) {
         err.fatal("input file is required.");
     }
 
+    if (config.count(option::cli_show_real_cmd_args)) {
+        dump_configure(config);
+        std::exit(0);
+    }
+
     return config;
 }
 

godel-script/godel-frontend/src/cli.h

@@ -18,6 +18,7 @@ enum class option {
     cli_run_souffle,       // generate souffle and run
     cli_dump_souffle_file, // generate souffle and dump
 
+    /* information dump */
     cli_help,          // get help
     cli_verbose,       // verbose output information
     cli_version,       // get version
@@ -29,29 +30,45 @@ enum class option {
     cli_dump_global,   // get global symbol information
     cli_dump_local,    // get local variables' information
 
+    /* language server */
     cli_dump_lsp,              // get godel frontend json dump
     cli_dump_lsp_file_indexed, // use indexed file name in json dump
+    cli_dump_lsp_only_schema,  // only dump schema
 
-    cli_lexer_dump_token,     // dump tokens
-    cli_lexer_dump_comment,   // dump comments
-    cli_semantic_only,        // only do semantic analysis and exit
-    cli_semantic_pub_check,   // switch pub-access check on
-    cli_semantic_no_else,     // switch no-else check on
+    /* lexer */
+    cli_lexer_dump_token,   // dump tokens
+    cli_lexer_dump_comment, // dump comments
 
+    /* semantic analysis */
+    cli_semantic_only,      // only do semantic analysis and exit
+    cli_semantic_pub_check, // switch pub-access check on
+
+    /* optimization */
     cli_enable_for_opt,             // switch for optimization on
     cli_enable_let_opt,             // switch let optimization on
     cli_enable_ir_merge,            // switch ir merge on
     cli_enable_self_constraint_opt, // switch self constraint optimization on
+    cli_enable_join_reorder,        // switch join reorder optimization on
     cli_disable_remove_unused,      // switch unused method deletion off
     cli_disable_do_schema_opt,      // switch do schema optimization off
     cli_souffle_debug_dump,         // switch souffle debug mode on
     cli_souffle_slow_transformers,  // switch souffle slow transformers on
-    cli_enable_souffle_cache,       // switch souffle cache on
-    cli_clean_souffle_cache,        // switch clean souffle cache on
     cli_enable_souffle_profiling,   // switch souffle profiling on
+
+    /* souffle cache */
+    cli_enable_souffle_cache, // switch souffle cache on
+    cli_clean_souffle_cache,  // switch clean souffle cache on
+
+    /* souffle output redirection */
     cli_souffle_json_output,        // switch souffle json output on
     cli_souffle_csv_output,         // switch souffle csv output on
-    cli_souffle_sqlite_output       // switch souffle sqlite output on
+    cli_souffle_sqlite_output,      // switch souffle sqlite output on
+
+    /* directly run souffle */
+    cli_directly_run_souffle, // run souffle directly
+
+    /* special debug info */
+    cli_show_real_cmd_args
 };
 
 struct info_setting {
@@ -94,12 +111,12 @@ const std::unordered_map<std::string, option> options = {
     {"--dump-local", option::cli_dump_local},
     {"--dump-lsp", option::cli_dump_lsp},
     {"--lsp-dump-use-indexed-file", option::cli_dump_lsp_file_indexed},
+    {"--lsp-dump-only-schema", option::cli_dump_lsp_only_schema},
     {"--color-off", option::cli_color_off},
     {"--lexer-dump-token", option::cli_lexer_dump_token},
     {"--lexer-dump-comment", option::cli_lexer_dump_comment},
     {"--semantic-only", option::cli_semantic_only},
     {"--semantic-pub-check", option::cli_semantic_pub_check},
-    {"--semantic-no-else", option::cli_semantic_no_else},
     {"--opt-for", option::cli_enable_for_opt},
     {"-Of", option::cli_enable_for_opt},
     {"--opt-let", option::cli_enable_let_opt},
@@ -108,13 +125,29 @@ const std::unordered_map<std::string, option> options = {
     {"-Oim", option::cli_enable_ir_merge},
     {"--opt-self-constraint", option::cli_enable_self_constraint_opt},
     {"-Osc", option::cli_enable_self_constraint_opt},
+    {"--opt-join-reorder", option::cli_enable_join_reorder},
+    {"-Ojr", option::cli_enable_join_reorder},
     {"--disable-remove-unused", option::cli_disable_remove_unused},
     {"--disable-do-schema-opt", option::cli_disable_do_schema_opt},
     {"--souffle-debug", option::cli_souffle_debug_dump},
     {"--souffle-slow-transformers", option::cli_souffle_slow_transformers},
     {"--enable-souffle-profiling", option::cli_enable_souffle_profiling},
     {"--enable-souffle-cache", option::cli_enable_souffle_cache},
-    {"--clean-souffle-cache", option::cli_clean_souffle_cache}
+    {"--clean-souffle-cache", option::cli_clean_souffle_cache},
+    {"-Drs", option::cli_directly_run_souffle},
+    {"--directly-run-souffle", option::cli_directly_run_souffle},
+    {"-###", option::cli_show_real_cmd_args}
+};
+
+const std::unordered_map<std::string, std::vector<option>> multi_options = {
+    {"-O1", {option::cli_enable_for_opt}},
+    {"-O2", {option::cli_enable_for_opt,
+             option::cli_enable_self_constraint_opt,
+             option::cli_enable_ir_merge}},
+    {"-O3", {option::cli_enable_for_opt,
+             option::cli_enable_self_constraint_opt,
+             option::cli_enable_ir_merge,
+             option::cli_enable_join_reorder}}
 };
 
 typedef std::unordered_map<option, std::string> configure;
@@ -123,6 +156,7 @@ std::ostream& welcome(std::ostream&);
 std::ostream& version(std::ostream&);
 std::ostream& help(std::ostream&);
 void report_invalid_argument(const std::string&);
+void dump_configure(const configure&);
 configure process_args(const std::vector<std::string>&);
 
 }