diff --git a/core/intrinsics/intrinsics.odin b/core/intrinsics/intrinsics.odin index 93cd0e505..33c4e2b07 100644 --- a/core/intrinsics/intrinsics.odin +++ b/core/intrinsics/intrinsics.odin @@ -215,10 +215,10 @@ simd_shr_masked :: proc(a: #simd[N]T, b: #simd[N]Unsigned_Integer) -> #simd[N]T simd_add_sat :: proc(a, b: #simd[N]T) -> #simd[N]T --- simd_sub_sat :: proc(a, b: #simd[N]T) -> #simd[N]T --- -simd_and :: proc(a, b: #simd[N]T) -> #simd[N]T --- -simd_or :: proc(a, b: #simd[N]T) -> #simd[N]T --- -simd_xor :: proc(a, b: #simd[N]T) -> #simd[N]T --- -simd_and_not :: proc(a, b: #simd[N]T) -> #simd[N]T --- +simd_bit_and :: proc(a, b: #simd[N]T) -> #simd[N]T --- +simd_bit_or :: proc(a, b: #simd[N]T) -> #simd[N]T --- +simd_bit_xor :: proc(a, b: #simd[N]T) -> #simd[N]T --- +simd_bit_and_not :: proc(a, b: #simd[N]T) -> #simd[N]T --- simd_neg :: proc(a: #simd[N]T) -> #simd[N]T --- diff --git a/core/simd/simd.odin b/core/simd/simd.odin index a0a4df28d..9d530ec31 100644 --- a/core/simd/simd.odin +++ b/core/simd/simd.odin @@ -77,10 +77,10 @@ shr_masked :: intrinsics.simd_shr_masked add_sat :: intrinsics.simd_add_sat sub_sat :: intrinsics.simd_sub_sat -and :: intrinsics.simd_and -or :: intrinsics.simd_or -xor :: intrinsics.simd_xor -and_not :: intrinsics.simd_and_not +bit_and :: intrinsics.simd_bit_and +bit_or :: intrinsics.simd_bit_or +bit_xor :: intrinsics.simd_bit_xor +bit_and_not :: intrinsics.simd_bit_and_not neg :: intrinsics.simd_neg diff --git a/src/check_builtin.cpp b/src/check_builtin.cpp index 851665cb2..49095a7a8 100644 --- a/src/check_builtin.cpp +++ b/src/check_builtin.cpp @@ -471,10 +471,10 @@ gb_internal bool check_builtin_simd_operation(CheckerContext *c, Operand *operan // Integer only case BuiltinProc_simd_add_sat: case BuiltinProc_simd_sub_sat: - case BuiltinProc_simd_and: - case BuiltinProc_simd_or: - case BuiltinProc_simd_xor: - case BuiltinProc_simd_and_not: + case BuiltinProc_simd_bit_and: + case BuiltinProc_simd_bit_or: + case BuiltinProc_simd_bit_xor: + case BuiltinProc_simd_bit_and_not: { Operand x = {}; Operand y = {}; diff --git a/src/checker_builtin_procs.hpp b/src/checker_builtin_procs.hpp index edd046087..c89ab2429 100644 --- a/src/checker_builtin_procs.hpp +++ b/src/checker_builtin_procs.hpp @@ -139,10 +139,10 @@ BuiltinProc__simd_begin, BuiltinProc_simd_add_sat, // saturation arithmetic BuiltinProc_simd_sub_sat, // saturation arithmetic - BuiltinProc_simd_and, - BuiltinProc_simd_or, - BuiltinProc_simd_xor, - BuiltinProc_simd_and_not, + BuiltinProc_simd_bit_and, + BuiltinProc_simd_bit_or, + BuiltinProc_simd_bit_xor, + BuiltinProc_simd_bit_and_not, BuiltinProc_simd_neg, BuiltinProc_simd_abs, @@ -442,10 +442,10 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = { {STR_LIT("simd_add_sat"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("simd_sub_sat"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("simd_and"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("simd_or"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("simd_xor"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("simd_and_not"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("simd_bit_and"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("simd_bit_or"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("simd_bit_xor"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("simd_bit_and_not"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("simd_neg"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, diff --git a/src/llvm_backend_proc.cpp b/src/llvm_backend_proc.cpp index 3b145b09d..8588ffd3c 100644 --- a/src/llvm_backend_proc.cpp +++ b/src/llvm_backend_proc.cpp @@ -1345,15 +1345,15 @@ gb_internal lbValue lb_build_builtin_simd_proc(lbProcedure *p, Ast *expr, TypeAn } } break; - case BuiltinProc_simd_and: - case BuiltinProc_simd_or: - case BuiltinProc_simd_xor: - case BuiltinProc_simd_and_not: + case BuiltinProc_simd_bit_and: + case BuiltinProc_simd_bit_or: + case BuiltinProc_simd_bit_xor: + case BuiltinProc_simd_bit_and_not: switch (builtin_id) { - case BuiltinProc_simd_and: op_code = LLVMAnd; break; - case BuiltinProc_simd_or: op_code = LLVMOr; break; - case BuiltinProc_simd_xor: op_code = LLVMXor; break; - case BuiltinProc_simd_and_not: + case BuiltinProc_simd_bit_and: op_code = LLVMAnd; break; + case BuiltinProc_simd_bit_or: op_code = LLVMOr; break; + case BuiltinProc_simd_bit_xor: op_code = LLVMXor; break; + case BuiltinProc_simd_bit_and_not: op_code = LLVMAnd; arg1.value = LLVMBuildNot(p->builder, arg1.value, ""); break;