Merge pull request #944 from SteveBronder/feature/SoA

Adds mem_pattern needed for SoA and AoS types

Author: SteveBronder

Jenkinsfile

@@ -196,7 +196,8 @@ pipeline {
                             cat shotgun_perf_all.tests >> all.tests
                             cat all.tests
                             echo "CXXFLAGS+=-march=core2" > cmdstan/make/local
-                            cd cmdstan; make clean-all; git show HEAD --stat; make -j4 build; cd ..
+                            echo "PRECOMPILED_HEADERS=false" >> cmdstan/make/local
+                            cd cmdstan; make clean-all; git show HEAD --stat; cd ..
                             CXX="${CXX}" ./compare-compilers.sh "--tests-file all.tests --num-samples=10" "\$(readlink -f ../bin/stanc)"
                         """
 

src/analysis_and_optimization/Factor_graph.ml

@@ -23,7 +23,7 @@ let extract_factors_statement stmt =
   | Stmt.Fixed.Pattern.TargetPE e ->
       List.map (summation_terms e) ~f:(fun x -> TargetTerm x)
   | NRFunApp (CompilerInternal FnReject, _) -> [Reject]
-  | NRFunApp ((UserDefined (s, FnTarget) | StanLib (s, FnTarget)), args) ->
+  | NRFunApp ((UserDefined (s, FnTarget) | StanLib (s, FnTarget, _)), args) ->
       [LPFunction (s, args)]
   | Assignment (_, _)
    |NRFunApp (_, _)

src/analysis_and_optimization/Mir_utils.ml

@@ -30,7 +30,8 @@ let rec num_expr_value (v : Expr.Typed.t) : (float * string) option =
   | {pattern= Fixed.Pattern.Lit (Real, str); _}
    |{pattern= Fixed.Pattern.Lit (Int, str); _} ->
       Some (float_of_string str, str)
-  | {pattern= Fixed.Pattern.FunApp (StanLib ("PMinus__", FnPlain), [v]); _} -> (
+  | {pattern= Fixed.Pattern.FunApp (StanLib ("PMinus__", FnPlain, _), [v]); _}
+  -> (
     match num_expr_value v with
     | Some (v, s) -> Some (-.v, "-" ^ s)
     | None -> None )
@@ -295,7 +296,7 @@ let expr_assigned_var Expr.Fixed.({pattern; _}) =
 (** See interface file *)
 let rec summation_terms (Expr.Fixed.({pattern; _}) as rhs) =
   match pattern with
-  | FunApp (StanLib ("Plus__", FnPlain), [e1; e2]) ->
+  | FunApp (StanLib ("Plus__", FnPlain, _), [e1; e2]) ->
       List.append (summation_terms e1) (summation_terms e2)
   | _ -> [rhs]
 

src/analysis_and_optimization/Monotone_framework.ml

@@ -442,7 +442,7 @@ let assigned_vars_stmt (s : (Expr.Typed.t, 'a) Stmt.Fixed.Pattern.t) =
   match s with
   | Assignment ((x, _, _), _) -> Set.Poly.singleton x
   | TargetPE _ -> Set.Poly.singleton "target"
-  | NRFunApp ((UserDefined (_, FnTarget) | StanLib (_, FnTarget)), _) ->
+  | NRFunApp ((UserDefined (_, FnTarget) | StanLib (_, FnTarget, _)), _) ->
       Set.Poly.singleton "target"
   | For {loopvar= x; _} -> Set.Poly.singleton x
   | Decl {decl_id= _; _}
@@ -485,7 +485,8 @@ let reaching_definitions_transfer
          |For {loopvar= x; _} ->
             Set.filter p ~f:(fun (y, _) -> y = x)
         | TargetPE _ -> Set.filter p ~f:(fun (y, _) -> y = "target")
-        | NRFunApp ((UserDefined (_, FnTarget) | StanLib (_, FnTarget)), _) ->
+        | NRFunApp ((UserDefined (_, FnTarget) | StanLib (_, FnTarget, _)), _)
+          ->
             Set.filter p ~f:(fun (y, _) -> y = "target")
         | NRFunApp (_, _)
          |Break | Continue | Return _ | Skip

src/analysis_and_optimization/Optimize.ml

@@ -238,7 +238,7 @@ let rec inline_function_expression propto adt fim
       match kind with
       | CompilerInternal _ ->
           (d_list, s_list, {e with pattern= FunApp (kind, es)})
-      | UserDefined (fname, suffix) | StanLib (fname, suffix) -> (
+      | UserDefined (fname, suffix) | StanLib (fname, suffix, _) -> (
           let suffix, fname' =
             match suffix with
             | FnLpdf propto' when propto' && propto ->
@@ -252,7 +252,7 @@ let rec inline_function_expression propto adt fim
               let fun_kind =
                 match kind with
                 | Fun_kind.UserDefined _ -> Fun_kind.UserDefined (fname, suffix)
-                | _ -> StanLib (fname, suffix)
+                | _ -> StanLib (fname, suffix, AoS)
               in
               (d_list, s_list, {e with pattern= FunApp (fun_kind, es)})
           | Some (rt, args, b) ->
@@ -388,7 +388,7 @@ let rec inline_function_statement propto adt fim Stmt.Fixed.({pattern; meta}) =
             slist_concat_no_loc (d_list @ s_list)
               ( match kind with
               | CompilerInternal _ -> NRFunApp (kind, es)
-              | UserDefined (s, _) | StanLib (s, _) -> (
+              | UserDefined (s, _) | StanLib (s, _, _) -> (
                 match Map.find fim s with
                 | None -> NRFunApp (kind, es)
                 | Some (_, args, b) ->
@@ -593,8 +593,8 @@ let unroll_loop_one_step_statement _ =
           IfElse
             ( Expr.Fixed.
                 { lower with
-                  pattern= FunApp (StanLib ("Geq__", FnPlain), [upper; lower])
-                }
+                  pattern=
+                    FunApp (StanLib ("Geq__", FnPlain, SoA), [upper; lower]) }
             , { pattern=
                   (let body_unrolled =
                      subst_args_stmt [loopvar] [lower]
@@ -610,7 +610,7 @@ let unroll_loop_one_step_statement _ =
                                { lower with
                                  pattern=
                                    FunApp
-                                     ( StanLib ("Plus__", FnPlain)
+                                     ( StanLib ("Plus__", FnPlain, SoA)
                                      , [lower; Expr.Helpers.loop_bottom] ) } }
                      ; meta= Location_span.empty }
                    in
@@ -694,7 +694,7 @@ and accum_any pred b e = b || expr_any pred e
 
 let can_side_effect_top_expr (e : Expr.Typed.t) =
   match e.pattern with
-  | FunApp ((UserDefined (_, FnTarget) | StanLib (_, FnTarget)), _) -> true
+  | FunApp ((UserDefined (_, FnTarget) | StanLib (_, FnTarget, _)), _) -> true
   | FunApp (CompilerInternal internal_fn, _) ->
       Internal_fun.can_side_effect internal_fn
   | _ -> false
@@ -703,7 +703,7 @@ let cannot_duplicate_expr (e : Expr.Typed.t) =
   let pred e =
     can_side_effect_top_expr e
     || ( match e.pattern with
-       | FunApp ((UserDefined (_, FnRng) | StanLib (_, FnRng)), _) -> true
+       | FunApp ((UserDefined (_, FnRng) | StanLib (_, FnRng, _)), _) -> true
        | _ -> false )
     || (preserve_stability && UnsizedType.is_autodiffable e.meta.type_)
   in