Add the option to turn off inverted branch condition checking

zacikpa · Jul 21, 2023 · 4e30de2 · 4e30de2
1 parent bee54b7
commit 4e30de2
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 6 deletions.
diff --git a/diffkemp/cli.py b/diffkemp/cli.py
@@ -144,7 +144,8 @@ def make_argument_parser():
                         "numerical-macros",
                         "relocations",
                         "type-casts",
-                        "control-flow-only",]
+                        "control-flow-only",
+                        "inverse-conditions"]
 
     # Semantic patterns options.
     compare_ap.add_argument("--enable-pattern",

diff --git a/diffkemp/simpll/Config.cpp b/diffkemp/simpll/Config.cpp
@@ -100,8 +100,10 @@ BuiltinPatterns parseBuiltinPatternArgs(const builtin_pattern_args &Args) {
         Patterns.KernelPrints = true;
         Patterns.DeadCode = true;
         Patterns.NumericalMacros = true;
+        Patterns.Relocations = true;
         Patterns.TypeCasts = true;
         Patterns.ControlFlowOnly = true;
+        Patterns.InverseConditions = true;
     }
     if (Args.DisableAll) {
         Patterns.StructAlignment = false;
@@ -110,8 +112,10 @@ BuiltinPatterns parseBuiltinPatternArgs(const builtin_pattern_args &Args) {
         Patterns.KernelPrints = false;
         Patterns.DeadCode = false;
         Patterns.NumericalMacros = false;
+        Patterns.Relocations = true;
         Patterns.TypeCasts = false;
         Patterns.ControlFlowOnly = false;
+        Patterns.InverseConditions = false;
     }
     if (Args.EnableStructAlignment)
         Patterns.StructAlignment = true;
@@ -152,6 +156,10 @@ BuiltinPatterns parseBuiltinPatternArgs(const builtin_pattern_args &Args) {
     }
     if (Args.DisableControlFlowOnly)
         Patterns.ControlFlowOnly = false;
+    if (Args.EnableInverseConditions)
+        Patterns.InverseConditions = true;
+    if (Args.DisableInverseConditions)
+        Patterns.InverseConditions = false;
 
     return Patterns;
 }
diff --git a/diffkemp/simpll/Config.h b/diffkemp/simpll/Config.h
@@ -37,6 +37,7 @@ struct BuiltinPatterns {
     bool Relocations;
     bool TypeCasts;
     bool ControlFlowOnly;
+    bool InverseConditions;
 };
 
 const BuiltinPatterns DEFAULT_BUILTIN_PATTERNS = {
@@ -61,7 +62,9 @@ const BuiltinPatterns DEFAULT_BUILTIN_PATTERNS = {
         // Changes in type casts
         .TypeCasts = false,
         // Ignore all changes except those in control-flow
-        .ControlFlowOnly = false};
+        .ControlFlowOnly = false,
+        // Inverted branch conditions
+        .InverseConditions = true};
 
 BuiltinPatterns parseBuiltinPatternArgs(const builtin_pattern_args &args);
 

diff --git a/diffkemp/simpll/DifferentialFunctionComparator.cpp b/diffkemp/simpll/DifferentialFunctionComparator.cpp
@@ -372,7 +372,8 @@ int DifferentialFunctionComparator::cmpOperations(
 #endif
         }
         // Record inverse conditions
-        if (isa<CmpInst>(L) && isa<CmpInst>(R)) {
+        if (config.BuiltinPatterns.InverseConditions && isa<CmpInst>(L)
+            && isa<CmpInst>(R)) {
             auto CmpL = dyn_cast<CmpInst>(L);
             auto CmpR = dyn_cast<CmpInst>(R);
 

diff --git a/diffkemp/simpll/SimpLL.cpp b/diffkemp/simpll/SimpLL.cpp
@@ -131,11 +131,11 @@ cl::opt<bool> DisablePatternNumericalMacros(
                  " macro as semantically different"));
 cl::opt<bool> EnablePatternRelocations(
         "enable-pattern-relocations",
-        cl::desc("Treat suitable differences caused by instruction relocation"
+        cl::desc("Treat suitable differences caused by instruction relocation "
                  "as semantically equal"));
 cl::opt<bool> DisablePatternRelocations(
         "disable-pattern-relocations",
-        cl::desc("Treat suitable differences caused by instruction relocation"
+        cl::desc("Treat suitable differences caused by instruction relocation "
                  "as semantically different"));
 cl::opt<bool> EnablePatternTypeCasts(
         "enable-pattern-type-casts",
@@ -151,6 +151,14 @@ cl::opt<bool> DisablePatternControlFlowOnly(
         "disable-pattern-control-flow-only",
         cl::desc("Treat differences not caused by control flow related "
                  "operations as semantically different"));
+cl::opt<bool> EnablePatternInverseConditions(
+        "enable-pattern-inverse-conditions",
+        cl::desc("Treat suitable differences caused by inverted "
+                 "branch conditions as semantically equal"));
+cl::opt<bool> DisablePatterInverseConditions(
+        "disable-pattern-inverse conditions",
+        cl::desc("Treat suitable differences caused by inverted "
+                 "branch conditions as semantically different"));
 
 /// Add suffix to the file name.
 /// \param File Original file name.
@@ -209,7 +217,8 @@ int main(int argc, const char **argv) {
             .DisableTypeCasts = DisablePatternTypeCasts,
             .EnableControlFlowOnly = EnablePatternControlFlowOnly,
             .DisableControlFlowOnly = DisablePatternControlFlowOnly,
-    };
+            .EnableInverseConditions = EnablePatternInverseConditions,
+            .DisableInverseConditions = DisablePatterInverseConditions};
 
     // Parse --fun option
     auto FunName = parseFunOption();

diff --git a/diffkemp/simpll/library/FFI.h b/diffkemp/simpll/library/FFI.h
@@ -44,6 +44,8 @@ struct builtin_pattern_args {
     int DisableTypeCasts;
     int EnableControlFlowOnly;
     int DisableControlFlowOnly;
+    int EnableInverseConditions;
+    int DisableInverseConditions;
 };
 
 struct config {

diff --git a/diffkemp/simpll/simpll.py b/diffkemp/simpll/simpll.py
@@ -66,6 +66,10 @@ def run_simpll(first, second, fun_first, fun_second, var, config, suffix=None,
             "numerical-macros" in config.enabled_patterns
         builtin_pattern_args.DisableNumericalMacros = \
             "numerical-macros" in config.disabled_patterns
+        builtin_pattern_args.EnableRelocations = \
+            "relocations" in config.enabled_patterns
+        builtin_pattern_args.DisableRelocations = \
+            "relocations" in config.disabled_patterns
         builtin_pattern_args.EnableTypeCasts = \
             "type-casts" in config.enabled_patterns
         builtin_pattern_args.DisableTypeCasts = \
@@ -74,6 +78,10 @@ def run_simpll(first, second, fun_first, fun_second, var, config, suffix=None,
             "control-flow-only" in config.enabled_patterns
         builtin_pattern_args.DisableControlFlowOnly = \
             "control-flow-only" in config.disabled_patterns
+        builtin_pattern_args.EnableInverseConditions = \
+            "inverse-conditions" in config.enabled_patterns
+        builtin_pattern_args.DisableInverseConditions = \
+            "inverse-conditions" in config.disabled_patterns
 
         # Preload module if in modules_to_cache
         if modules_to_cache is None: