DFA state compression: 16-bit wide and sherman co-exist

fwessels · Jan 21, 2019 · c06d5e1 · c06d5e1
1 parent c7c4119
commit c06d5e1
Show file tree

Hide file tree

Showing 10 changed files with 894 additions and 72 deletions.
diff --git a/src/grey.cpp b/src/grey.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Intel Corporation
+ * Copyright (c) 2015-2018, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -82,6 +82,7 @@ Grey::Grey(void) :
                    onlyOneOutfix(false),
                    allowShermanStates(true),
                    allowMcClellan8(true),
+                   allowWideStates(true), // enable wide state for McClellan8
                    highlanderPruneDFA(true),
                    minimizeDFA(true),
                    accelerateDFA(true),
@@ -251,6 +252,7 @@ void applyGreyOverrides(Grey *g, const string &s) {
         G_UPDATE(onlyOneOutfix);
         G_UPDATE(allowShermanStates);
         G_UPDATE(allowMcClellan8);
+        G_UPDATE(allowWideStates);
         G_UPDATE(highlanderPruneDFA);
         G_UPDATE(minimizeDFA);
         G_UPDATE(accelerateDFA);

diff --git a/src/grey.h b/src/grey.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Intel Corporation
+ * Copyright (c) 2015-2018, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -87,6 +87,7 @@ struct Grey {
 
     bool allowShermanStates;
     bool allowMcClellan8;
+    bool allowWideStates; // enable wide state for McClellan8
     bool highlanderPruneDFA;
     bool minimizeDFA;
 

diff --git a/src/nfa/accel_dfa_build_strat.h b/src/nfa/accel_dfa_build_strat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, Intel Corporation
+ * Copyright (c) 2015-2018, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -40,6 +40,11 @@ namespace ue2 {
 
 class ReportManager;
 struct Grey;
+enum DfaType {
+    McClellan,
+    Sheng,
+    Gough
+};
 
 class accel_dfa_build_strat : public dfa_build_strat {
 public:
@@ -53,6 +58,8 @@ class accel_dfa_build_strat : public dfa_build_strat {
     virtual void buildAccel(dstate_id_t this_idx, const AccelScheme &info,
                             void *accel_out);
     virtual std::map<dstate_id_t, AccelScheme> getAccelInfo(const Grey &grey);
+    virtual DfaType getType() const = 0;
+
 private:
     bool only_accel_init;
 };

diff --git a/src/nfa/goughcompile.cpp b/src/nfa/goughcompile.cpp
@@ -91,6 +91,7 @@ class gough_build_strat : public mcclellan_build_strat {
     void buildAccel(dstate_id_t this_idx, const AccelScheme &info,
                     void *accel_out) override;
     u32 max_allowed_offset_accel() const override { return 0; }
+    DfaType getType() const override { return Gough; }
 
     raw_som_dfa &rdfa;
     const GoughGraph &gg;