Add more optimizer cases (#612)

Author: loader3229

src/eval/optimizer.cpp

@@ -161,12 +161,28 @@ bool Optimizer::mergeOps(Program &p) const {
         // first sub, the other max?
         else if (o1.type == Operation::Type::SUB &&
                  o2.type == Operation::Type::MAX &&
-                 o2.source.type == Operand::Type::CONSTANT &&
                  o2.source.value == 0) {
           o1.type = Operation::Type::TRN;
           do_merge = true;
         }
 
+        // first trn, second add?
+        else if (o1.type == Operation::Type::TRN &&
+                 o2.type == Operation::Type::ADD &&
+				 o1.source.value == o2.source.value) {
+          o1.type = Operation::Type::MAX;
+          do_merge = true;
+        }
+        
+        // first add, second trn?
+        else if (o1.type == Operation::Type::ADD &&
+		         o2.type == Operation::Type::TRN &&
+				 o1.source.value == o2.source.value) {
+          o1.type = Operation::Type::MAX;
+          o1.source = Operand(Operand::Type::CONSTANT, 0);
+          do_merge = true;
+        }
+        
         // first mul, second div?
         else if (o1.type == Operation::Type::MUL &&
                  o2.type == Operation::Type::DIV &&
@@ -255,6 +271,19 @@ bool Optimizer::mergeOps(Program &p) const {
           o1.source = Operand(Operand::Type::CONSTANT, 0);
           do_merge = true;
         }
+        
+        // first trn, second add?
+        else if (o1.type == Operation::Type::TRN && o2.type == Operation::Type::ADD) {
+          o1.type = Operation::Type::MAX;
+          do_merge = true;
+        }
+        
+        // first add, second trn?
+        else if (o1.type == Operation::Type::ADD && o2.type == Operation::Type::TRN) {
+          o1.type = Operation::Type::MAX;
+          o1.source = Operand(Operand::Type::CONSTANT, 0);
+          do_merge = true;
+        }
       }
 
       // first operation mov with constant?

tests/optimizer/E078.asm

@@ -0,0 +1,11 @@
+; in
+sub $0,5
+mov $1,$0
+div $1,3
+add $0,$1
+trn $0,$1
+; out
+sub $0,5
+mov $1,$0
+div $1,3
+max $0,0

tests/optimizer/E079.asm

@@ -0,0 +1,11 @@
+; in
+sub $0,5
+mov $1,$0
+div $1,3
+trn $0,$1
+add $0,$1
+; out
+sub $0,5
+mov $1,$0
+div $1,3
+max $0,$1

tests/optimizer/E080.asm

@@ -0,0 +1,5 @@
+; in
+trn $0,7
+add $0,7
+; out
+max $0,7

tests/optimizer/E081.asm

@@ -0,0 +1,5 @@
+; in
+add $0,7
+trn $0,7
+; out
+max $0,0