Fixed the nitpick_run.cc error

Author: lukas-valenta-tul

nitpick/exprcase.hh

@@ -53,7 +53,7 @@ namespace bparser {
 
 		PatchArenaPtr arena;
 		Parser parser;
-		std::string parseQuery;
+		std::string parseExpr;
 
 		std::unordered_map<string, VarInfo> variables;
 		std::unordered_map<string, std::vector<double>> variable_consts;
@@ -76,10 +76,10 @@ namespace bparser {
 		void set_result_shape(Shape shape) {
 			variables["_result_"] = VarInfo(Variable, shape);
 		}
-		void parse(string query) {
-			parseQuery = query;
+		void parse(string expression) {
+			parseExpr = expression;
 
-			parser.parse(query);
+			parser.parse(expression);
 		}
 
 	public: //Methods for the gen/run files
@@ -118,8 +118,8 @@ namespace bparser {
 		PatchArenaPtr get_patch_arena() const {
 			return arena;
 		}
-		string get_query() const {
-			return parseQuery;
+		string get_expression() const {
+			return parseExpr;
 		}
 
 		const std::unordered_map<double*, std::string>& get_inv_map() const{

nitpick/nitpick_generate.cc

@@ -21,6 +21,10 @@ int main() {
 	//def is in NITPICK_DEF_FILE
 	def(exprcase);
 
+	if (exprcase.get_expression().empty()) {
+		Throw() << "No expression was set!";
+	}
+
 	exprcase.allocate(1);
 	Parser& p = exprcase.get_parser();
 
@@ -35,5 +39,7 @@ int main() {
 	file << DagPrinter(dag).print_in_cxx(exprcase.get_inv_map());
 	file.close();
 	std::cout << "File " << std::filesystem::current_path() << " " << NITPICK_GEN_FILE << " created from " << NITPICK_DEF_FILE;
+
 	::operator delete(buffer);
-}
+
+} //main

nitpick/nitpick_run.cc

@@ -12,24 +12,25 @@ using namespace bparser;
 int main() {
 
 	const uint max_vec_size = 2000;
-	const size_t buffer_size = sizeof(double) * max_vec_size + 50000;
+	const size_t buffer_size = sizeof(double) * max_vec_size + 500000;
 
-	const uint N = 2048U;
+	const uint N = 1073741824U; //2^30
 
 	void* buffer = ::operator new(buffer_size);
 	ExprCase exprcase(max_vec_size, (void*)buffer, buffer_size);
 
 	def(exprcase);
 
-	if (exprcase.get_query().empty()) {
+	if (exprcase.get_expression().empty()) {
 		Throw() << "No expression was set!";
 	}
 
-	std::vector<uint> subset = { 0, 1, 2, 3 }; //ctverice doubluu //TODO: autocreate from vec_size
+	std::vector<uint> subset = { 0, 1, 2, 3, 4,5,6,7,8,9,10,11,12 }; //ctverice doubluu //TODO: autocreate from vec_size
 	std::vector<uint> vec_sizes({ 16U, 64U, 256U, 1024U });
 
 	PatchArenaPtr arena = exprcase.get_patch_arena();
 	for (uint vec_size : vec_sizes) {
+
 		uint n_repeats = N / vec_size;
 		std::cout << "Running \"" << exprcase.get_query() << "\" " << n_repeats << "x for vec_size: " << vec_size << std::endl;
 		exprcase.allocate(vec_size);
@@ -38,7 +39,6 @@ int main() {
 		ExpressionDAG se = gen(exprcase.get_node_map());
 
 		ProcessorBase* processor = ProcessorBase::create_processor(se, max_vec_size, bparser::get_simd_size(), arena); //get arena from ExprCase
-		//ProcessorBase* processor = ProcessorBase::create_processor(se, max_vec_size, bparser::get_simd_size(), nullptr);
 		processor->set_subset(subset);
 
 		auto start_time = std::chrono::high_resolution_clock::now();
@@ -49,17 +49,18 @@ int main() {
 
 		double time = std::chrono::duration_cast<std::chrono::duration<double>>(end_time - start_time).count();
 		std::cout << "Finished in " << time << std::endl;
-		//processor.get_arena();
-		delete processor;
 
-		exprcase.deallocate();
-	}
-	//auto start_time = std::chrono::high_resolution_clock::now();
 
-	//TODO:
+		exprcase.deallocate(); //processor is allocated in arena
+	} //for
+
+
+	//TODO: have result
 	//std::cout << "Result: \n";
 
 	// Result in the 'vres' value space.
 	//std::cout << print_vec(vres, vres_size);
+
 	::operator delete(buffer);
-}
+
+} //main