release v1.1

.clang-format

@@ -13,10 +13,8 @@ BinPackArguments: false
 
 AllowAllParametersOfDeclarationOnNextLine: false
 BinPackParameters: true
-ColumnLimit: 0
 
 AlignAfterOpenBracket: DontAlign
-ContinuationIndentWidth: 4
 
 ColumnLimit: 100
 SpaceBeforeParens: ControlStatements

.github/workflows/main.yml

@@ -1,26 +1,41 @@
-name: lootinator-release-builds
+name: lootinator-release-build
 
-on: [push]
+on:
+  push:
+    branches:
+      - main
 
 jobs:
   linux:
     name: build/release/linux
     runs-on: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: setup
-        run: |
-          sudo apt update
-          sudo apt install build-essentials
-
-      - name: build
-          mkdir build && cd build && cmake ..
-          make -B -j8
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: lootinator-cli-linux
-          path: ./${{ github.event.repository.name }}/build/cli/lootinator-cli
-
-
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: setup
+      run: |
+        sudo apt update
+    - name: build
+      run: |
+        mkdir build && cd build && cmake ..
+        make -B -j8
+    - uses: actions/upload-artifact@v4
+      with:
+        name: lootinator-cli-linux
+        path: ./build/cli/lootinator-cli
+  windows:
+    name: build/release/windows
+    runs-on: [windows-latest]
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: build
+      run: |
+        cmake -S . -B build
+        cmake --build build --config Release
+    - uses: actions/upload-artifact@v4
+      with:
+        name: lootinator-cli-windows.exe
+        path: .\build\cli\Release\lootinator-cli.exe

.gitmodules

@@ -1,12 +1,6 @@
 [submodule "external/json"]
 	path = external/json
 	url = https://github.com/nlohmann/json.git
-[submodule "external/flag.h"]
-	path = external/flag.h
-	url = https://github.com/tsoding/flag.h
-[submodule "external/CLI11"]
-	path = external/CLI11
-	url = https://github.com/CLIUtils/CLI11
 [submodule "external/clipp"]
 	path = external/clipp
 	url = https://github.com/muellan/clipp

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.11`)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -16,5 +16,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 add_subdirectory(lootinator)
-add_subdirectory(example)
-add_subdirectory(cli)
+
+if(EMSCRIPTEN)
+	add_subdirectory(web)
+else()
+	add_subdirectory(example)
+	add_subdirectory(cli)
+endif()

cli/constraints.json

@@ -2,7 +2,7 @@
     {
         "item": "minecraft:gold_block",
         "range": {
-            "min": 5,
+            "min": 50,
             "max": 1000
         },
         "slot": 0

cli/src/main.cpp

@@ -13,38 +13,56 @@ int main(int argc, char** argv) {
 	std::string constraint_file = "";
 	std::string version_str = "";
 	std::string output_file = "a.cu";
+	std::string seed_output_file = "loot_seeds.txt";
 
-	auto cli = (
-		(clipp::required("--loot-table") & clipp::value("file_path.json", loot_table),
-		clipp::required("--constraint-file") & clipp::value("file_path.json", constraint_file),
-		clipp::required("-o", "--output") & clipp::value("filepath", output_file),
-		clipp::option("-sc", "--seedcracking").set(seedcracking).doc("seedcracking mode"),
-		clipp::option("-sk", "--single-kernel").set(single_kernel).doc("single kernel mode"),
-		clipp::option("-v", "--version")
-				.doc("the target Minecraft version e.g. 1.16 or latest, currently latest is 26.1") &
-			clipp::value("version", version_str))
-		| clipp::required("--list-versions").set(list_versions).doc("list supported Minecraft versions")
-	);
-	static_assert(mc::VersionRange::MC_LATEST == mc::VersionRange::MC_1_21_11_TO_26_1,
+	auto cli =
+		((clipp::required("--loot-table") &
+				 clipp::value("file_path.json", loot_table).if_missing([] {
+					 std::cout << "Failed: you need to specify a loot table\n";
+				 }),
+			 clipp::required("--constraints") &
+				 clipp::value("file_path.json", constraint_file).if_missing([] {
+					 std::cout << "Failed: you need to specify a constraint file\n";
+				 }),
+			 clipp::option("-o", "--output") &
+				 clipp::value("filepath.cu", output_file)
+					 .doc("specify the output file for cuda, default is " + output_file),
+			 clipp::option("-sc", "--seedcracking").set(seedcracking).doc("seedcracking mode"),
+			 clipp::option("-sk", "--single-kernel").set(single_kernel).doc("single kernel mode"),
+			 clipp::option("-so", "--seed-output") &
+				 clipp::value("file_path.txt", seed_output_file)
+					 .doc("specify the output file for seeds, default is " + seed_output_file),
+			 clipp::required("-v", "--version")
+					 .doc("the target Minecraft version e.g. 1.16 or latest, currently latest is "
+						  "26.2") &
+				 clipp::value("version", version_str).if_missing([] {
+					 std::cout << "Failed: you need to specify a minecraft version\n";
+				 }))
+
+			| clipp::required("--list-versions")
+				  .set(list_versions)
+				  .doc("list supported Minecraft versions"));
+	static_assert(mc::VersionRange::MC_LATEST == mc::VersionRange::MC_1_21_11_TO_26_2,
 		"update the doc of version to reflect the latest version");
 
 	if (!clipp::parse(argc, argv, cli)) {
 		std::cout << clipp::make_man_page(cli, argv[0]);
-		exit(1);
+		exit(loot::LootinatorErrorKind::INVALID_ARGUMENTS);
 	}
 
 	if (list_versions) {
 		std::cout << "Supported Minecraft Versions:\n";
-		for (const auto& v : mc::get_supported_versions()) {
-			std::cout << v << "\n";
+		for (const auto& version : mc::get_supported_versions()) {
+			std::cout << version << "\n";
 		}
-		exit(0);
+		exit(loot::LootinatorErrorKind::SUCCESS);
 	}
 
 	mc::VersionRange version = mc::parse_version(version_str);
 	if (version == mc::MC_UNDEFINED) {
-		fprintf(stderr, "Lootinator failed: version is undefined!\n");
-		exit(1);
+		int error_code = loot::LootinatorErrorKind::INVALID_ARGUMENTS;
+		std::cout << "Lootinator failed (" << error_code << "): version is undefined.\n";
+		exit(error_code);
 	}
 
 	std::ofstream fout(output_file);
@@ -54,23 +72,23 @@ int main(int argc, char** argv) {
 	loot::LootinatorError err = loot::LootinatorError(loot::LootinatorErrorKind::SUCCESS);
 	if (single_kernel) {
 		err = loot::generate_best_pipeline_heur(
-			loot_table, constraint_file, version, seedcracking, &s);
+			loot_table, constraint_file, version, seedcracking, &s, seed_output_file);
 	} else {
-		err =
-			loot::generate_benchmark_source(loot_table, constraint_file, version, seedcracking, &s);
+		err = loot::generate_benchmark_source(
+			loot_table, constraint_file, version, seedcracking, &s, seed_output_file);
 	}
 
 	if (err.kind == loot::LootinatorErrorKind::SUCCESS) {
 		fout << s;
-		std::cout << "Cuda generation was successful.\n";
-		std::cout << "==== Selected Options ====\n";
+		std::cout << "========= Results =========\n";
+		std::cout << "  Output File:   " << output_file << "\n";
 		std::cout << "  Version Range: " << mc::get_version_from_enum(version) << "\n";
 		std::cout << "  Constraints:   " << constraint_file << "\n";
 		std::cout << "  Seedcracking:  " << (seedcracking ? "true\n" : "false\n");
 		std::cout << "  Single Kernel: " << (single_kernel ? "true\n" : "false\n");
-		std::cout << "  Output File:   " << output_file << "\n";
-		std::cout << "==========================\n";
+		std::cout << "===========================\n";
 	} else {
-		std::cout << "Lootinator failed: " << err.message << '\n';
+		std::cout << "Lootinator failed (" << err.kind << "): " << err.message << '\n';
+		exit(err.kind);
 	}
 }

example/src/main.cpp

@@ -21,7 +21,7 @@ int main() {
 	std::string s;
 
 	loot::LootinatorError err = loot::generate_best_pipeline_heur(
-		loot_table_file, constraints_file, mc::MC_1_21_TO_1_21_10, true, &s);
+		loot_table_file, constraints_file, mc::MC_1_21_TO_1_21_10, true, &s, "loot_seeds.txt");
 
 	if (err.kind == loot::LootinatorErrorKind::SUCCESS) {
 		fout << s;

lootinator/CMakeLists.txt

@@ -12,10 +12,6 @@ add_library(lootinator
 	include/lootinator/lootinator.h
 	include/lootinator/mc/minecraft.hpp
 	include/lootinator/probability/loot_prob.h
-	include/lootinator/template/helpers.h
-	include/lootinator/template/kernel/naive_bruteforce_template.h
-	include/lootinator/template/kernel_template.h
-	include/lootinator/template/template.h
 	include/lootinator/utility/debug.h
 	include/lootinator/utility/enum_bimap.hpp
 	include/lootinator/utility/mth.h
@@ -33,17 +29,14 @@ add_library(lootinator
 	src/lootinator.cpp
 	src/mc/minecraft.cpp
 	src/probability/loot_prob.cpp
-	src/template/helpers.cpp
-	src/template/kernel/naive_bruteforce_template.cpp
-	src/template/kernel_template.cpp
-	src/template/template.cpp
 	src/utility/debug.cpp
 )
 
 target_include_directories(lootinator PUBLIC include)
 
 set(TEST_FILES
-	tests/smoke_tests.cpp
+	tests/function_order_dfs.cpp
+	tests/test_kgen_config.cpp
 )
 
 # TODO: compiler flags, (-O3, warnings, etc)

lootinator/include/lootinator/kgen/kernel.hpp

@@ -21,9 +21,10 @@ namespace kgen {
 
 		// any extra scuffed stuff goes here
 		bool using_nvrtc = false;
+		std::string seeds_output;
 
 		KernelGenConfig(mc::VersionRange version, std::string loot_table, std::string constraints,
-			bool seedcracking);
+			bool seedcracking, std::string seeds_output);
 
 		void traverse_and_derive(data::LootTreeNode* root, bool** edges);
 		void construct_order(bool** edges, const int num_functions, data::LootTreeNode* root);
@@ -32,6 +33,7 @@ namespace kgen {
 
 	struct ConfiguredKernel {
 		std::string kernel_name;
+		std::string seeds_output;
 		std::string code;
 
 		uint64_t total_threads;

lootinator/include/lootinator/lootinator.h

@@ -24,7 +24,9 @@ namespace loot {
 		BAD_CONSTRAINT_FILE,
 		BAD_LOOT_TABLE,
 		RANGE_PARSE,
-		INTERNAL_ERROR
+		INTERNAL_ERROR,
+		MC_VERSION_UNDEFINED,
+		INVALID_ARGUMENTS
 	};
 
 	std::string parse_errno(LootinatorErrorKind error);
@@ -46,19 +48,19 @@ namespace loot {
 
 	LootinatorError generate_best_pipeline_heur(const std::string loot_table_filepath,
 		const std::string constraint_filepath, const mc::VersionRange version_range,
-		const bool use_seedcracking_mode, std::string* result);
+		const bool use_seedcracking_mode, std::string* result, std::string seeds_output);
 
 	LootinatorError generate_benchmark_source(const std::string loot_table_filepath,
 		const std::string constraint_filepath, const mc::VersionRange version_range,
-		const bool use_seedcracking_mode, std::string* result);
+		const bool use_seedcracking_mode, std::string* result, std::string seeds_output);
 
 	LootinatorError generate_best_pipeline_heur_from_string(const std::string loot_table,
 		const std::string constraints, const mc::VersionRange version_range,
-		const bool use_seedcracking_mode, std::string* result);
+		const bool use_seedcracking_mode, std::string* result, std::string seeds_output);
 
 	LootinatorError generate_benchmark_source_from_string(const std::string loot_table,
 		const std::string constraints, const mc::VersionRange version_range,
-		const bool use_seedcracking_mode, std::string* result);
+		const bool use_seedcracking_mode, std::string* result, std::string seeds_output);
 } // namespace loot
 
 #endif

lootinator/include/lootinator/mc/minecraft.hpp

@@ -13,7 +13,7 @@ namespace mc {
 	X(MC_1_14_TO_1_15)                                                                             \
 	X(MC_1_16_TO_1_20)                                                                             \
 	X(MC_1_21_TO_1_21_10)                                                                          \
-	X(MC_1_21_11_TO_26_1)
+	X(MC_1_21_11_TO_26_2)
 
 	enum VersionRange {
 #define X(v) v,