qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 21:21:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Add anti-commutative flags for cross and fp sub

Browse source 
They're still not set, but the commutativity can be adjusted
individually.
This commit is contained in:
Bill Currie 2024-09-30 19:17:56 +09:00
parent 275201afdf
commit eade7e9a85
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfcc/include/options.h
View file

@ -51,6 +51,8 @@ typedef struct {
bool commute_float_add; // allow fp addition to commute bool commute_float_add; // allow fp addition to commute
bool commute_float_mul; // allow fp multiplication to commute bool commute_float_mul; // allow fp multiplication to commute
bool commute_float_dot; // allow fp dot product to commute bool commute_float_dot; // allow fp dot product to commute
bool anticom_float_cross;// allow fp cross product to anti-commute
bool anticom_float_sub; // allow fp subtraction to anti-commute
bool assoc_float_add; // allow fp addition to be associative bool assoc_float_add; // allow fp addition to be associative
bool assoc_float_mul; // allow fp multiplication to be associative bool assoc_float_mul; // allow fp multiplication to be associative
bool no_double; // double fp type is not supported bool no_double; // double fp type is not supported

30
tools/qfcc/source/expr_binary.c
View file

@ -88,6 +88,16 @@ static bool fp_com_dot (void)
return options.code.commute_float_dot; return options.code.commute_float_dot;
} }
static bool fp_anti_cross (void)
{
return options.code.anticom_float_cross;
}
static bool fp_anti_sub (void)
{
return options.code.anticom_float_sub;
}
static bool fp_ass_add (void) static bool fp_ass_add (void)
{ {
return options.code.assoc_float_add; return options.code.assoc_float_add;
@ -113,7 +123,7 @@ static expr_type_t float_float[] = {
{'+', &type_float, {'+', &type_float,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_float, {'-', &type_float,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{'*', &type_float, {'*', &type_float,
.commutative = fp_com_mul, .associative = fp_ass_mul}, .commutative = fp_com_mul, .associative = fp_ass_mul},
{'/', &type_float}, {'/', &type_float},
@ -152,7 +162,7 @@ static expr_type_t float_int[] = {
{'+', &type_float, 0, &type_float, {'+', &type_float, 0, &type_float,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_float, 0, &type_float, {'-', &type_float, 0, &type_float,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{'*', &type_float, 0, &type_float, {'*', &type_float, 0, &type_float,
.commutative = fp_com_mul, .associative = fp_ass_mul}, .commutative = fp_com_mul, .associative = fp_ass_mul},
{'/', &type_float, 0, &type_float}, {'/', &type_float, 0, &type_float},
@ -181,7 +191,7 @@ static expr_type_t float_double[] = {
{'+', &type_double, &type_double, 0, {'+', &type_double, &type_double, 0,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_double, &type_double, 0, {'-', &type_double, &type_double, 0,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{'*', &type_double, &type_double, 0, {'*', &type_double, &type_double, 0,
.commutative = fp_com_mul, .associative = fp_ass_mul}, .commutative = fp_com_mul, .associative = fp_ass_mul},
{'/', &type_double, &type_double, 0}, {'/', &type_double, &type_double, 0},
@ -206,11 +216,11 @@ static expr_type_t vector_vector[] = {
{'+', &type_vector, {'+', &type_vector,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_vector, {'-', &type_vector,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{QC_DOT, .process = vector_dot, {QC_DOT, .process = vector_dot,
.commutative = fp_com_dot}, .commutative = fp_com_dot},
{QC_CROSS, &type_vector, {QC_CROSS, &type_vector,
.anticommute = fp_com_add}, .anticommute = fp_anti_cross},
{QC_HADAMARD, &type_vector, {QC_HADAMARD, &type_vector,
.commutative = fp_com_mul, .associative = fp_ass_mul}, .commutative = fp_com_mul, .associative = fp_ass_mul},
{'*', .process = vector_multiply}, {'*', .process = vector_multiply},
@ -286,7 +296,7 @@ static expr_type_t quat_quat[] = {
{'+', &type_quaternion, {'+', &type_quaternion,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_quaternion, {'-', &type_quaternion,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{'*', &type_quaternion, .associative = always, .true_op = QC_QMUL}, {'*', &type_quaternion, .associative = always, .true_op = QC_QMUL},
{QC_EQ, .process = quat_compare}, {QC_EQ, .process = quat_compare},
{QC_NE, .process = quat_compare}, {QC_NE, .process = quat_compare},
@ -311,7 +321,7 @@ static expr_type_t int_float[] = {
{'+', &type_float, &type_float, 0, {'+', &type_float, &type_float, 0,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_float, &type_float, 0, {'-', &type_float, &type_float, 0,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{'*', &type_float, &type_float, 0, {'*', &type_float, &type_float, 0,
.commutative = fp_com_mul, .associative = fp_ass_mul}, .commutative = fp_com_mul, .associative = fp_ass_mul},
{'/', &type_float, &type_float, 0}, {'/', &type_float, &type_float, 0},
@ -597,7 +607,7 @@ static expr_type_t double_float[] = {
{'+', &type_double, 0, &type_double, {'+', &type_double, 0, &type_double,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_double, 0, &type_double, {'-', &type_double, 0, &type_double,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{'*', &type_double, 0, &type_double, {'*', &type_double, 0, &type_double,
.commutative = fp_com_mul, .associative = fp_ass_mul}, .commutative = fp_com_mul, .associative = fp_ass_mul},
{'/', &type_double, 0, &type_double}, {'/', &type_double, 0, &type_double},
@ -626,7 +636,7 @@ static expr_type_t double_int[] = {
{'+', &type_double, 0, &type_double, {'+', &type_double, 0, &type_double,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_double, 0, &type_double, {'-', &type_double, 0, &type_double,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{'*', &type_double, 0, &type_double, {'*', &type_double, 0, &type_double,
.commutative = fp_com_mul, .associative = fp_ass_mul}, .commutative = fp_com_mul, .associative = fp_ass_mul},
{'/', &type_double, 0, &type_double}, {'/', &type_double, 0, &type_double},
@ -647,7 +657,7 @@ static expr_type_t double_double[] = {
{'+', &type_double, {'+', &type_double,
.commutative = fp_com_add, .associative = fp_ass_add}, .commutative = fp_com_add, .associative = fp_ass_add},
{'-', &type_double, {'-', &type_double,
.anticommute = fp_com_add}, .anticommute = fp_anti_sub},
{'*', &type_double, {'*', &type_double,
.commutative = fp_com_mul, .associative = fp_ass_mul}, .commutative = fp_com_mul, .associative = fp_ass_mul},
{'/', &type_double}, {'/', &type_double},