Refactor SLS engine and evaluator components for bit-vector specifics and adjust memory manager alignment

src/ast/sls/CMakeLists.txt

@@ -5,13 +5,13 @@ z3_add_component(ast_sls
     sls_arith_base.cpp
     sls_arith_plugin.cpp
     sls_basic_plugin.cpp
+    sls_bv_engine.cpp
     sls_bv_eval.cpp
     sls_bv_fixed.cpp
     sls_bv_plugin.cpp
     sls_bv_terms.cpp
     sls_bv_valuation.cpp
     sls_context.cpp
-    sls_engine.cpp
     sls_euf_plugin.cpp
     sls_smt_solver.cpp
   COMPONENT_DEPENDENCIES

src/ast/sls/bvsls_opt_engine.h

@@ -18,7 +18,7 @@ Notes:
 --*/
 #pragma once
 
-#include "ast/sls/sls_engine.h"
+#include "ast/sls/sls_bv_engine.h"
 
 class bvsls_opt_engine : public sls_engine {
     sls_tracker   & m_hard_tracker;

src/ast/sls/sls_bv_engine.cpp

@@ -26,7 +26,7 @@ Notes:
 #include "util/luby.h"
 
 #include "params/sls_params.hpp"
-#include "ast/sls/sls_engine.h"
+#include "ast/sls/sls_bv_engine.h"
 
 
 sls_engine::sls_engine(ast_manager & m, params_ref const & p) :

src/ast/sls/sls_bv_engine.h

@@ -23,8 +23,8 @@ Notes:
 #include "ast/converters/model_converter.h"
 
 #include "ast/sls/sls_stats.h"
-#include "ast/sls/sls_tracker.h"
-#include "ast/sls/sls_evaluator.h"
+#include "ast/sls/sls_bv_tracker.h"
+#include "ast/sls/sls_bv_evaluator.h"
 
 class sls_engine {
 

src/ast/sls/sls_bv_evaluator.h

@@ -22,7 +22,7 @@ Notes:
 #include "model/model_evaluator.h"
 
 #include "ast/sls/sls_powers.h"
-#include "ast/sls/sls_tracker.h"
+#include "ast/sls/sls_bv_tracker.h"
 
 class sls_evaluator {
     ast_manager         & m_manager;