From 4a296032ab7de20f80ba088104614b340727099b Mon Sep 17 00:00:00 2001
From: Christoffer Lerno <christoffer@aegik.com>
Date: Sun, 28 Aug 2022 16:22:10 +0200
Subject: [PATCH] Add fshl fshr + new optimizer.

---
 lib/std/bits.c3                  | 20 +++++++++
 lib/std/core/types.c3            |  2 +-
 src/build/build_options.c        |  6 +++
 src/build/build_options.h        | 26 ++++++------
 src/build/builder.c              |  1 +
 src/compiler/enums.h             |  2 +
 src/compiler/llvm_codegen.c      | 72 ++++++++++++++++++++++++++++----
 src/compiler/llvm_codegen_expr.c |  4 ++
 src/compiler/sema_expr.c         | 11 +++++
 src/compiler/symtab.c            |  2 +
 src/version.h                    |  2 +-
 11 files changed, 127 insertions(+), 21 deletions(-)

diff --git a/lib/std/bits.c3 b/lib/std/bits.c3
index e2f12c6ea..1a6e7fd17 100644
--- a/lib/std/bits.c3
+++ b/lib/std/bits.c3
@@ -39,3 +39,23 @@ macro clz(i) @builtin
 {
 	return $$clz(i);
 }
+
+/**
+ * @require types::is_intlike($typeof(hi)) && types::is_intlike($typeof(lo)) && types::is_intlike($typeof(shift)) `The input must be an integer or integer vector`
+ * @require $typeof(hi).typeid == $typeof(lo).typeid `Hi and low arguments must have the same type`
+ * @require $typeof(hi).typeid == $typeof(shift).typeid `The shift value must have the same type`
+ **/
+macro fshl(hi, lo, shift) @builtin
+{
+	return $$fshl(hi, lo, ($typeof(hi))shift);
+}
+
+/**
+ * @require types::is_intlike($typeof(hi)) && types::is_intlike($typeof(lo)) && types::is_intlike($typeof(shift)) `The input must be an integer or integer vector`
+ * @require $typeof(hi).typeid == $typeof(lo).typeid `Hi and low arguments must have the same type`
+ * @require $typeof(hi).typeid == $typeof(shift).typeid `The shift value must have the same type`
+ **/
+macro fshr(hi, lo, shift) @builtin
+{
+	return $$fshr(hi, lo, ($typeof(hi))shift);
+}
diff --git a/lib/std/core/types.c3 b/lib/std/core/types.c3
index b7e05ca46..7a2d1ec17 100644
--- a/lib/std/core/types.c3
+++ b/lib/std/core/types.c3
@@ -128,7 +128,7 @@ macro bool is_intlike($Type)
 		$case UNSIGNED_INT:
 			return true;
 		$case VECTOR:
-			return is_intlike($Type.inner);
+			return $Type.inner.kind == TypeKind.SIGNED_INT || $Type.inner.kind == TypeKind.UNSIGNED_INT;
 		$default:
 			return false;
 	$endswitch;
diff --git a/src/build/build_options.c b/src/build/build_options.c
index 53ffb9fa6..46417f2ba 100644
--- a/src/build/build_options.c
+++ b/src/build/build_options.c
@@ -114,6 +114,7 @@ static void usage(void)
 	OUTPUT("  -L <library dir>      - Append the directory to the linker search paths.");
 	OUTPUT("  -z <argument>         - Send the <argument> as a parameter to the linker.");
 	OUTPUT("  --forcelinker         - Force built in linker usage when doing non-cross linking.");
+	OUTPUT("  --newoptimizer        - Use new optimizer pipeline.");
 	OUTPUT("");
 	OUTPUT("  --reloc=<option>      - Relocation model: none, pic, PIC, pie, PIE");
 	OUTPUT("  --x86vec=<option>     - Set max level of vector instructions: none, mmx, sse, avx, avx512.");
@@ -463,6 +464,11 @@ static void parse_option(BuildOptions *options)
 				options->symtab_size = next_highest_power_of_2(symtab);
 				return;
 			}
+			if (match_longopt("newoptimizer"))
+			{
+				options->use_new_optimizer = true;
+				return;
+			}
 			if (match_longopt("forcelinker"))
 			{
 				if (llvm_version_major > 12)
diff --git a/src/build/build_options.h b/src/build/build_options.h
index cc0cf6db4..1dd4b9cdd 100644
--- a/src/build/build_options.h
+++ b/src/build/build_options.h
@@ -257,6 +257,7 @@ typedef struct BuildOptions_
 	bool test_mode;
 	bool no_stdlib;
 	bool force_linker;
+	bool use_new_optimizer;
 	const char *panicfn;
 	const char *cc;
 	const char *build_dir;
@@ -321,18 +322,19 @@ typedef struct
 	const char *object_file_dir;
 	const char *llvm_file_dir;
 	const char *asm_file_dir;
-	bool run_after_compile : 1;
-	bool test_output : 1;
-	bool output_headers : 1;
-	bool output_ast : 1;
-	bool lex_only : 1;
-	bool parse_only : 1;
-	bool check_only : 1;
-	bool emit_llvm : 1;
-	bool emit_asm : 1;
-	bool no_stdlib : 1;
-	bool emit_object_files : 1;
-	bool force_linker : 1;
+	bool run_after_compile;
+	bool test_output;
+	bool output_headers;
+	bool output_ast;
+	bool lex_only;
+	bool parse_only;
+	bool check_only;
+	bool emit_llvm;
+	bool emit_asm;
+	bool no_stdlib;
+	bool emit_object_files;
+	bool force_linker;
+	bool use_new_optimizer;
 	OptimizationLevel optimization_level;
 	SizeOptimizationLevel size_optimization_level;
 	DebugInfo debug_info;
diff --git a/src/build/builder.c b/src/build/builder.c
index 1deb8601d..f26a4a5c1 100644
--- a/src/build/builder.c
+++ b/src/build/builder.c
@@ -196,6 +196,7 @@ static void update_build_target_from_options(BuildTarget *target, BuildOptions *
 	target->emit_llvm = options->emit_llvm;
 	target->emit_asm = options->emit_asm;
 	target->force_linker = options->force_linker;
+	target->use_new_optimizer = options->use_new_optimizer;
 	target->panicfn = options->panicfn;
 	if (options->macos.sdk) target->macos.sdk = options->macos.sdk;
 	if (options->win.sdk) target->win.sdk = options->win.sdk;
diff --git a/src/compiler/enums.h b/src/compiler/enums.h
index d76d9ca83..acdb9e8e5 100644
--- a/src/compiler/enums.h
+++ b/src/compiler/enums.h
@@ -767,6 +767,8 @@ typedef enum
 	BUILTIN_EXP,
 	BUILTIN_FABS,
 	BUILTIN_FMA,
+	BUILTIN_FSHR,
+	BUILTIN_FSHL,
 	BUILTIN_CTPOP,
 	BUILTIN_CTLZ,
 	BUILTIN_CTTZ,
diff --git a/src/compiler/llvm_codegen.c b/src/compiler/llvm_codegen.c
index 2e4528b10..9aa8e2fab 100644
--- a/src/compiler/llvm_codegen.c
+++ b/src/compiler/llvm_codegen.c
@@ -2,7 +2,16 @@
 // Use of this source code is governed by the GNU LGPLv3.0 license
 // a copy of which can be found in the LICENSE file.
 
+#include <llvm-c/Error.h>
 #include "llvm_codegen_internal.h"
+typedef struct LLVMOpaquePassBuilderOptions *LLVMPassBuilderOptionsRef;
+LLVMErrorRef LLVMRunPasses(LLVMModuleRef M, const char *Passes,
+                           LLVMTargetMachineRef TM,
+                           LLVMPassBuilderOptionsRef Options);
+LLVMPassBuilderOptionsRef LLVMCreatePassBuilderOptions(void);
+void LLVMPassBuilderOptionsSetVerifyEach(LLVMPassBuilderOptionsRef Options, LLVMBool VerifyEach);
+void LLVMPassBuilderOptionsSetDebugLogging(LLVMPassBuilderOptionsRef Options, LLVMBool DebugLogging);
+void LLVMDisposePassBuilderOptions(LLVMPassBuilderOptionsRef Options);
 
 const char* llvm_version = LLVM_VERSION_STRING;
 const char* llvm_target = LLVM_DEFAULT_TARGET_TRIPLE;
@@ -800,11 +809,8 @@ static void llvm_emit_type_decls(GenContext *context, Decl *decl)
 	}
 }
 
-const char *llvm_codegen(void *context)
+static inline void llvm_opt_old(GenContext *c)
 {
-	GenContext *c = context;
-	LLVMModuleRef module = c->module;
-	// Starting from here we could potentially thread this:
 	LLVMPassManagerBuilderRef pass_manager_builder = LLVMPassManagerBuilderCreate();
 	LLVMPassManagerBuilderSetOptLevel(pass_manager_builder, (unsigned)active_target.optimization_level);
 	LLVMPassManagerBuilderSetSizeLevel(pass_manager_builder, (unsigned)active_target.size_optimization_level);
@@ -814,7 +820,7 @@ const char *llvm_codegen(void *context)
 		LLVMPassManagerBuilderUseInlinerWithThreshold(pass_manager_builder, (unsigned)get_inlining_threshold());
 	}
 	LLVMPassManagerRef pass_manager = LLVMCreatePassManager();
-	LLVMPassManagerRef function_pass_manager = LLVMCreateFunctionPassManagerForModule(module);
+	LLVMPassManagerRef function_pass_manager = LLVMCreateFunctionPassManagerForModule(c->module);
 	LLVMAddAnalysisPasses(c->machine, function_pass_manager);
 	LLVMAddAnalysisPasses(c->machine, pass_manager);
 	LLVMPassManagerBuilderPopulateModulePassManager(pass_manager_builder, pass_manager);
@@ -828,7 +834,7 @@ const char *llvm_codegen(void *context)
 
 	// Run function passes
 	LLVMInitializeFunctionPassManager(function_pass_manager);
-	LLVMValueRef current_function = LLVMGetFirstFunction(module);
+	LLVMValueRef current_function = LLVMGetFirstFunction(c->module);
 	while (current_function)
 	{
 		LLVMRunFunctionPassManager(function_pass_manager, current_function);
@@ -838,8 +844,60 @@ const char *llvm_codegen(void *context)
 	LLVMDisposePassManager(function_pass_manager);
 
 	// Run module pass
-	LLVMRunPassManager(pass_manager, module);
+	LLVMRunPassManager(pass_manager, c->module);
 	LLVMDisposePassManager(pass_manager);
+}
+
+static inline void llvm_opt_new(GenContext *c)
+{
+	LLVMPassBuilderOptionsRef options = LLVMCreatePassBuilderOptions();
+	LLVMPassBuilderOptionsSetVerifyEach(options, active_target.emit_llvm);
+	const char *passes = NULL;
+	switch (active_target.size_optimization_level)
+	{
+		case SIZE_OPTIMIZATION_SMALL:
+			passes = "default<Os>";
+			break;
+		case SIZE_OPTIMIZATION_TINY:
+			passes = "default<Oz>";
+			break;
+		default:
+			break;
+	}
+	switch (active_target.optimization_level)
+	{
+		case OPTIMIZATION_NONE:
+			passes = "default<O0>";
+			break;
+		case OPTIMIZATION_NOT_SET:
+		case OPTIMIZATION_DEFAULT:
+			if (!passes) passes = "default<O2>";
+			break;
+		case OPTIMIZATION_LESS:
+			if (!passes) passes = "default<O1>";
+			break;
+		case OPTIMIZATION_AGGRESSIVE:
+			if (!passes) passes = "default<O3>";
+			break;
+	}
+	LLVMErrorRef err = LLVMRunPasses(c->module, passes, c->machine, options);
+	if (err)
+	{
+		error_exit("An error occurred: %s.", LLVMGetErrorMessage(err));
+	}
+	LLVMDisposePassBuilderOptions(options);
+}
+const char *llvm_codegen(void *context)
+{
+	GenContext *c = context;
+	if (active_target.use_new_optimizer)
+	{
+		llvm_opt_new(c);
+	}
+	else
+	{
+		llvm_opt_old(c);
+	}
 
 	// Serialize the LLVM IR, if requested, also verify the IR in this case
 	if (active_target.emit_llvm)
diff --git a/src/compiler/llvm_codegen_expr.c b/src/compiler/llvm_codegen_expr.c
index 7b0e40136..22e0a8103 100644
--- a/src/compiler/llvm_codegen_expr.c
+++ b/src/compiler/llvm_codegen_expr.c
@@ -4353,6 +4353,10 @@ unsigned llvm_get_intrinsic(BuiltinFunction func)
 			return intrinsic_id.fabs;
 		case BUILTIN_FMA:
 			return intrinsic_id.fma;
+		case BUILTIN_FSHL:
+			return intrinsic_id.fshl;
+		case BUILTIN_FSHR:
+			return intrinsic_id.fshr;
 		case BUILTIN_BITREVERSE:
 			return intrinsic_id.bitreverse;
 		case BUILTIN_BSWAP:
diff --git a/src/compiler/sema_expr.c b/src/compiler/sema_expr.c
index eff0935ed..bb527bc09 100644
--- a/src/compiler/sema_expr.c
+++ b/src/compiler/sema_expr.c
@@ -2483,6 +2483,8 @@ static inline unsigned builtin_expected_args(BuiltinFunction func)
 		case BUILTIN_VOLATILE_STORE:
 			return 2;
 		case BUILTIN_FMA:
+		case BUILTIN_FSHR:
+		case BUILTIN_FSHL:
 			return 3;
 		case BUILTIN_MEMSET:
 			return 5;
@@ -2716,6 +2718,14 @@ static inline bool sema_expr_analyse_builtin_call(SemaContext *context, Expr *ex
 			if (!sema_check_builtin_args_match(args, arg_count)) return false;
 			rtype = args[0]->type;
 			break;
+		case BUILTIN_FSHL:
+		case BUILTIN_FSHR:
+			if (!sema_check_builtin_args(args,
+			                             (BuiltinArg[]) { BA_INTLIKE, BA_INTLIKE, BA_INTLIKE },
+			                             arg_count)) return false;
+			if (!sema_check_builtin_args_match(args, arg_count)) return false;
+			rtype = args[0]->type;
+			break;
 		case BUILTIN_VOLATILE_LOAD:
 		{
 			if (!sema_check_builtin_args(args, (BuiltinArg[]) { BA_POINTER }, 1)) return false;
@@ -3694,6 +3704,7 @@ static inline bool sema_create_const_inner(SemaContext *context, Expr *expr, Typ
 	expr->expr_kind = EXPR_CONST;
 	expr->const_expr.const_kind = CONST_TYPEID;
 	expr->const_expr.typeid = inner->canonical;
+	expr->type = type_typeid;
 	return true;
 }
 
diff --git a/src/compiler/symtab.c b/src/compiler/symtab.c
index 80b1ffd79..66bddb09a 100644
--- a/src/compiler/symtab.c
+++ b/src/compiler/symtab.c
@@ -199,6 +199,8 @@ void symtab_init(uint32_t capacity)
 	builtin_list[BUILTIN_MIN] = KW_DEF("min");
 	builtin_list[BUILTIN_FMA] = KW_DEF("fma");
 	builtin_list[BUILTIN_FABS] = KW_DEF("fabs");
+	builtin_list[BUILTIN_FSHL] = KW_DEF("fshl");
+	builtin_list[BUILTIN_FSHR] = KW_DEF("fshr");
 	builtin_list[BUILTIN_VOLATILE_STORE] = KW_DEF("volatile_store");
 	builtin_list[BUILTIN_VOLATILE_LOAD] = KW_DEF("volatile_load");
 	builtin_list[BUILTIN_SYSCALL] = KW_DEF("syscall");
diff --git a/src/version.h b/src/version.h
index fad0ae21c..a11b521f2 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define COMPILER_VERSION "0.3.29"
\ No newline at end of file
+#define COMPILER_VERSION "0.3.30"
\ No newline at end of file