Rearrange files

cucapra · Jul 30, 2024 · 31e4470 · 31e4470
1 parent 432c8af
commit 31e4470
Show file tree

Hide file tree

Showing 59 changed files with 28 additions and 29 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -22,10 +22,10 @@ jobs:
         with:
           ocaml-compiler: 5
       - name: Install ocamlformat
-        working-directory: dsl_lang
+        working-directory: dsl
         run: opam install ocamlformat
       - name: Check format 
-        working-directory: dsl_lang
+        working-directory: dsl
         run: | 
           [ $(opam exec -- dune fmt 2> >(wc -c)) -eq 0 ]
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,11 +22,11 @@ jobs:
         with:
           ocaml-compiler: 5
       - name: Install dependencies
-        working-directory: dsl_lang
+        working-directory: dsl
         run: | 
           opam install . --deps-only
       - name: DSL tests
-        working-directory: dsl_lang
+        working-directory: dsl
         run: |
           opam exec -- dune build
           opam exec -- dune test

diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,7 @@
 *.cmxa
 
 # ocamlbuild working directory
-dsl_lang/_build/
+dsl/_build/
 
 # ocamlbuild targets
 *.byte

diff --git a/dsl_lang/.ocamlformat → dsl/.ocamlformat b/dsl_lang/.ocamlformat → dsl/.ocamlformat
diff --git a/dsl_lang/bin/dune → dsl/bin/dune b/dsl_lang/bin/dune → dsl/bin/dune
@@ -1,4 +1,4 @@
 (executable
- (public_name dsl_lang)
+ (public_name dsl)
  (name main)
  (libraries dsl_core))
diff --git a/dsl_lang/bin/main.ml → dsl/bin/main.ml b/dsl_lang/bin/main.ml → dsl/bin/main.ml
diff --git a/dsl_lang/dsl_lang.opam → dsl/dsl.opam b/dsl_lang/dsl_lang.opam → dsl/dsl.opam
diff --git a/dsl_lang/dune-project → dsl/dune-project b/dsl_lang/dune-project → dsl/dune-project
@@ -1,6 +1,6 @@
 (lang dune 3.16)
 
-(name dsl_lang)
+(name dsl)
 
 (generate_opam_files true)
 
@@ -24,7 +24,7 @@
 (using menhir 3.0)
 
 (package
- (name dsl_lang)
+ (name dsl)
  (synopsis "DSL for Programmable Packet Scheduling")
  (description "TBD")
  (depends ocaml dune ounit2 menhir))

diff --git a/dsl_lang/lib/ast.ml → dsl/lib/ast.ml b/dsl_lang/lib/ast.ml → dsl/lib/ast.ml
diff --git a/dsl_lang/lib/dune → dsl/lib/dune b/dsl_lang/lib/dune → dsl/lib/dune
diff --git a/dsl_lang/lib/eval.ml → dsl/lib/eval.ml b/dsl_lang/lib/eval.ml → dsl/lib/eval.ml
@@ -2,7 +2,6 @@ open Ast
 
 exception UnboundVariable of var
 exception UndeclaredClass of clss
-exception IllformedExpression of string
 
 (* A function to look up the binding for a variable in a store.
    `lookup s x` returns `s(x)` or raises `UnboundVariable x` if `x` is not defined on `s`. *)

diff --git a/dsl_lang/lib/lexer.mll → dsl/lib/lexer.mll b/dsl_lang/lib/lexer.mll → dsl/lib/lexer.mll
diff --git a/dsl_lang/lib/parse.ml → dsl/lib/parse.ml b/dsl_lang/lib/parse.ml → dsl/lib/parse.ml
diff --git a/dsl_lang/lib/parser.mly → dsl/lib/parser.mly b/dsl_lang/lib/parser.mly → dsl/lib/parser.mly
diff --git a/dsl_lang/lib/util.ml → dsl/lib/util.ml b/dsl_lang/lib/util.ml → dsl/lib/util.ml
diff --git a/dsl_lang/test/dune → dsl/test/dune b/dsl_lang/test/dune → dsl/test/dune
diff --git a/dsl_lang/test/well_formed.ml → dsl/test/well_formed.ml b/dsl_lang/test/well_formed.ml → dsl/test/well_formed.ml
@@ -1,7 +1,7 @@
 open Dsl_core
 open OUnit2
 
-let path_prefix = "../../../../"
+let path_prefix = "../../../../progs/"
 
 let eval_prog (filename : string) =
   path_prefix ^ filename |> Parse.parse_file |> Eval.eval
@@ -20,45 +20,45 @@ let make_error_test (name : string) (filename : string) (exn : exn) =
 
 let tests =
   [
-    make_test "single class policy" "dsl/progs/now/drop_a_class.sched" "A";
-    make_test "fifo sugar 1 class" "dsl/progs/now/fifo_1_class_sugar.sched" "A";
-    make_test "fifo 1 class" "dsl/progs/now/fifo_1_class.sched" "A";
-    make_test "fifo of 3" "dsl/progs/now/fifo_n_classes.sched" "fifo[A, B, C]";
-    make_test "rr of 1" "dsl/progs/now/rr_1_class.sched" "rr[A]";
-    make_test "rr of 2" "dsl/progs/now/rr_2_classes.sched" "rr[A, B]";
-    make_test "multiple assignments" "dsl/progs/now/rr_hier_merge_sugar.sched"
+    make_test "single class policy" "work_conserving/drop_a_class.sched" "A";
+    make_test "fifo sugar 1 class" "work_conserving/fifo_1_class_sugar.sched" "A";
+    make_test "fifo 1 class" "work_conserving/fifo_1_class.sched" "A";
+    make_test "fifo of 3" "work_conserving/fifo_n_classes.sched" "fifo[A, B, C]";
+    make_test "rr of 1" "work_conserving/rr_1_class.sched" "rr[A]";
+    make_test "rr of 2" "work_conserving/rr_2_classes.sched" "rr[A, B]";
+    make_test "multiple assignments" "work_conserving/rr_hier_merge_sugar.sched"
       "rr[fifo[BX, BY], rr[RP, RT]]";
-    make_test "2 assignments w/ substitutions" "dsl/progs/now/rr_hier.sched"
+    make_test "2 assignments w/ substitutions" "work_conserving/rr_hier.sched"
       "rr[B, rr[RP, RT]]";
     make_test "3 classes with substitutions"
-      "dsl/progs/soon/rr_n_class_hier.sched"
+      "work_conserving/rr_n_class_hier.sched"
       "rr[A, B, rr[rr[CU, CV], rr[CW, CX]]]";
-    make_test "rr of 3" "dsl/progs/soon/rr_n_classes.sched" "rr[A, B, C]";
+    make_test "rr of 3" "work_conserving/rr_n_classes.sched" "rr[A, B, C]";
     make_test "rr and strict substitutions"
-      "dsl/progs/soon/rr_strict_n_classes_hier.sched"
+      "work_conserving/rr_strict_n_classes_hier.sched"
       "strict[A, B, rr[rr[CU, CV], strict[CW, CX]]]";
-    make_test "strict of 3" "dsl/progs/soon/strict_n_classes.sched"
+    make_test "strict of 3" "work_conserving/strict_n_classes.sched"
       "strict[A, B, C]";
-    make_test "leaky bucket of 2" "dsl/progs/nwc/leaky_2_classes.sched"
+    make_test "leaky bucket of 2" "non_work_conserving/leaky_2_classes.sched"
       "leaky[[A, B], width = 5, buffer = 10]";
     make_test "token bucket of 2 round robins"
-      "dsl/progs/nwc/token_2_rr_children.sched"
+      "non_work_conserving/token_2_rr_children.sched"
       "token[[rr[A, B], rr[C, D]], width = 20, time = 50]";
-    make_test "stop and go with 3 classes" "dsl/progs/nwc/sg_3_classes.sched"
+    make_test "stop and go with 3 classes" "non_work_conserving/sg_3_classes.sched"
       "stopandgo[[stopandgo[[A, B], width = 10], stopandgo[[C], width = 10]], \
        width = 5]";
-    make_test "rcsp for 4 classes" "dsl/progs/nwc/rcsp_4_classes.sched"
+    make_test "rcsp for 4 classes" "non_work_conserving/rcsp_4_classes.sched"
       "rcsp[A, B, C, D]";
   ]
 
 let error_tests =
   [
     make_error_test "undeclared class"
-      "dsl/progs/incorrect/undeclared_classes.sched" (Eval.UndeclaredClass "Z");
-    make_error_test "unbound variable" "dsl/progs/incorrect/unbound_var.sched"
+      "incorrect/undeclared_classes.sched" (Eval.UndeclaredClass "Z");
+    make_error_test "unbound variable" "incorrect/unbound_var.sched"
       (Eval.UnboundVariable "policy");
     make_error_test "unbound var in middle of list of assignments"
-      "dsl/progs/incorrect/unbound_var_hier.sched"
+      "incorrect/unbound_var_hier.sched"
       (Eval.UnboundVariable "r_polic");
   ]
 

diff --git a/...ced_calculator/advan_calc_user_externs.so → ...ced_calculator/advan_calc_user_externs.so b/...ced_calculator/advan_calc_user_externs.so → ...ced_calculator/advan_calc_user_externs.so
diff --git a/...dvanced_calculator/advanced_calculator.p4 → ...dvanced_calculator/advanced_calculator.p4 b/...dvanced_calculator/advanced_calculator.p4 → ...dvanced_calculator/advanced_calculator.p4
diff --git a/progs/advanced_calculator/cli_commands.txt → ...rogs/advanced_calculator/cli_commands.txt b/progs/advanced_calculator/cli_commands.txt → ...rogs/advanced_calculator/cli_commands.txt
diff --git a/progs/advanced_calculator/traffic_in.user → p4-progs/advanced_calculator/traffic_in.user b/progs/advanced_calculator/traffic_in.user → p4-progs/advanced_calculator/traffic_in.user
diff --git a/progs/calculator/calculator.p4 → p4-progs/calculator/calculator.p4 b/progs/calculator/calculator.p4 → p4-progs/calculator/calculator.p4
diff --git a/progs/calculator/cli_commands.txt → p4-progs/calculator/cli_commands.txt b/progs/calculator/cli_commands.txt → p4-progs/calculator/cli_commands.txt
diff --git a/progs/calculator/traffic_in.user → p4-progs/calculator/traffic_in.user b/progs/calculator/traffic_in.user → p4-progs/calculator/traffic_in.user
diff --git a/progs/default/cli_commands.txt → p4-progs/default/cli_commands.txt b/progs/default/cli_commands.txt → p4-progs/default/cli_commands.txt
diff --git a/progs/default/default.p4 → p4-progs/default/default.p4 b/progs/default/default.p4 → p4-progs/default/default.p4
diff --git a/progs/default/traffic_in.user → p4-progs/default/traffic_in.user b/progs/default/traffic_in.user → p4-progs/default/traffic_in.user
diff --git a/progs/echo/cli_commands.txt → p4-progs/echo/cli_commands.txt b/progs/echo/cli_commands.txt → p4-progs/echo/cli_commands.txt
diff --git a/progs/echo/echo.p4 → p4-progs/echo/echo.p4 b/progs/echo/echo.p4 → p4-progs/echo/echo.p4
diff --git a/progs/echo/traffic_in.meta → p4-progs/echo/traffic_in.meta b/progs/echo/traffic_in.meta → p4-progs/echo/traffic_in.meta
diff --git a/progs/echo/traffic_in.user → p4-progs/echo/traffic_in.user b/progs/echo/traffic_in.user → p4-progs/echo/traffic_in.user
diff --git a/progs/five_tuple/cli_commands.txt → p4-progs/five_tuple/cli_commands.txt b/progs/five_tuple/cli_commands.txt → p4-progs/five_tuple/cli_commands.txt
diff --git a/progs/five_tuple/fiveTuple.p4 → p4-progs/five_tuple/fiveTuple.p4 b/progs/five_tuple/fiveTuple.p4 → p4-progs/five_tuple/fiveTuple.p4
diff --git a/progs/five_tuple/fiveTuple_tinycam.p4 → p4-progs/five_tuple/fiveTuple_tinycam.p4 b/progs/five_tuple/fiveTuple_tinycam.p4 → p4-progs/five_tuple/fiveTuple_tinycam.p4
diff --git a/progs/five_tuple/traffic_in.user → p4-progs/five_tuple/traffic_in.user b/progs/five_tuple/traffic_in.user → p4-progs/five_tuple/traffic_in.user
diff --git a/progs/forward/cli_commands.txt → p4-progs/forward/cli_commands.txt b/progs/forward/cli_commands.txt → p4-progs/forward/cli_commands.txt
diff --git a/progs/forward/forward.p4 → p4-progs/forward/forward.p4 b/progs/forward/forward.p4 → p4-progs/forward/forward.p4
diff --git a/progs/forward/forward_tinycam.p4 → p4-progs/forward/forward_tinycam.p4 b/progs/forward/forward_tinycam.p4 → p4-progs/forward/forward_tinycam.p4
diff --git a/progs/forward/traffic_in.user → p4-progs/forward/traffic_in.user b/progs/forward/traffic_in.user → p4-progs/forward/traffic_in.user
diff --git a/dsl/progs/incorrect/unbound_var.sched → progs/incorrect/unbound_var.sched b/dsl/progs/incorrect/unbound_var.sched → progs/incorrect/unbound_var.sched
diff --git a/dsl/progs/incorrect/unbound_var_hier.sched → progs/incorrect/unbound_var_hier.sched b/dsl/progs/incorrect/unbound_var_hier.sched → progs/incorrect/unbound_var_hier.sched
diff --git a/dsl/progs/incorrect/undeclared_classes.sched → progs/incorrect/undeclared_classes.sched b/dsl/progs/incorrect/undeclared_classes.sched → progs/incorrect/undeclared_classes.sched
diff --git a/dsl/progs/nwc/leaky_2_classes.sched → ...non_work_conserving/leaky_2_classes.sched b/dsl/progs/nwc/leaky_2_classes.sched → ...non_work_conserving/leaky_2_classes.sched
diff --git a/dsl/progs/nwc/rcsp_4_classes.sched → .../non_work_conserving/rcsp_4_classes.sched b/dsl/progs/nwc/rcsp_4_classes.sched → .../non_work_conserving/rcsp_4_classes.sched
diff --git a/dsl/progs/nwc/sg_3_classes.sched → progs/non_work_conserving/sg_3_classes.sched b/dsl/progs/nwc/sg_3_classes.sched → progs/non_work_conserving/sg_3_classes.sched
diff --git a/dsl/progs/nwc/token_2_rr_children.sched → ...work_conserving/token_2_rr_children.sched b/dsl/progs/nwc/token_2_rr_children.sched → ...work_conserving/token_2_rr_children.sched
diff --git a/dsl/progs/now/drop_a_class.sched → progs/work_conserving/drop_a_class.sched b/dsl/progs/now/drop_a_class.sched → progs/work_conserving/drop_a_class.sched
diff --git a/dsl/progs/now/fifo_1_class.sched → progs/work_conserving/fifo_1_class.sched b/dsl/progs/now/fifo_1_class.sched → progs/work_conserving/fifo_1_class.sched
diff --git a/dsl/progs/now/fifo_1_class_sugar.sched → .../work_conserving/fifo_1_class_sugar.sched b/dsl/progs/now/fifo_1_class_sugar.sched → .../work_conserving/fifo_1_class_sugar.sched
diff --git a/dsl/progs/now/fifo_n_classes.sched → progs/work_conserving/fifo_n_classes.sched b/dsl/progs/now/fifo_n_classes.sched → progs/work_conserving/fifo_n_classes.sched
diff --git a/dsl/progs/now/rr_1_class.sched → progs/work_conserving/rr_1_class.sched b/dsl/progs/now/rr_1_class.sched → progs/work_conserving/rr_1_class.sched
diff --git a/dsl/progs/now/rr_2_classes.sched → progs/work_conserving/rr_2_classes.sched b/dsl/progs/now/rr_2_classes.sched → progs/work_conserving/rr_2_classes.sched
diff --git a/dsl/progs/now/rr_hier.sched → progs/work_conserving/rr_hier.sched b/dsl/progs/now/rr_hier.sched → progs/work_conserving/rr_hier.sched
diff --git a/dsl/progs/now/rr_hier_merge_sugar.sched → ...work_conserving/rr_hier_merge_sugar.sched b/dsl/progs/now/rr_hier_merge_sugar.sched → ...work_conserving/rr_hier_merge_sugar.sched
diff --git a/dsl/progs/now/rr_hier_sugar.sched → progs/work_conserving/rr_hier_sugar.sched b/dsl/progs/now/rr_hier_sugar.sched → progs/work_conserving/rr_hier_sugar.sched
diff --git a/dsl/progs/soon/rr_n_class_hier.sched → progs/work_conserving/rr_n_class_hier.sched b/dsl/progs/soon/rr_n_class_hier.sched → progs/work_conserving/rr_n_class_hier.sched
diff --git a/dsl/progs/soon/rr_n_classes.sched → progs/work_conserving/rr_n_classes.sched b/dsl/progs/soon/rr_n_classes.sched → progs/work_conserving/rr_n_classes.sched
diff --git a/...progs/soon/rr_strict_n_classes_hier.sched → ...conserving/rr_strict_n_classes_hier.sched b/...progs/soon/rr_strict_n_classes_hier.sched → ...conserving/rr_strict_n_classes_hier.sched
diff --git a/dsl/progs/soon/strict_n_classes.sched → progs/work_conserving/strict_n_classes.sched b/dsl/progs/soon/strict_n_classes.sched → progs/work_conserving/strict_n_classes.sched