From 31e4470ace9c0763a2c60b62eca5deeb5484bb04 Mon Sep 17 00:00:00 2001 From: polybeandip Date: Mon, 29 Jul 2024 22:14:36 -0400 Subject: [PATCH] Rearrange files --- .github/workflows/format.yml | 4 +- .github/workflows/test.yml | 4 +- .gitignore | 2 +- {dsl_lang => dsl}/.ocamlformat | 0 {dsl_lang => dsl}/bin/dune | 2 +- {dsl_lang => dsl}/bin/main.ml | 0 dsl_lang/dsl_lang.opam => dsl/dsl.opam | 0 {dsl_lang => dsl}/dune-project | 4 +- {dsl_lang => dsl}/lib/ast.ml | 0 {dsl_lang => dsl}/lib/dune | 0 {dsl_lang => dsl}/lib/eval.ml | 1 - {dsl_lang => dsl}/lib/lexer.mll | 0 {dsl_lang => dsl}/lib/parse.ml | 0 {dsl_lang => dsl}/lib/parser.mly | 0 {dsl_lang => dsl}/lib/util.ml | 0 {dsl_lang => dsl}/test/dune | 0 {dsl_lang => dsl}/test/well_formed.ml | 40 +++++++++--------- .../advan_calc_user_externs.so | Bin .../advanced_calculator.p4 | 0 .../advanced_calculator/cli_commands.txt | 0 .../advanced_calculator/traffic_in.user | 0 {progs => p4-progs}/calculator/calculator.p4 | 0 .../calculator/cli_commands.txt | 0 .../calculator/traffic_in.user | 0 {progs => p4-progs}/default/cli_commands.txt | 0 {progs => p4-progs}/default/default.p4 | 0 {progs => p4-progs}/default/traffic_in.user | 0 {progs => p4-progs}/echo/cli_commands.txt | 0 {progs => p4-progs}/echo/echo.p4 | 0 {progs => p4-progs}/echo/traffic_in.meta | 0 {progs => p4-progs}/echo/traffic_in.user | 0 .../five_tuple/cli_commands.txt | 0 {progs => p4-progs}/five_tuple/fiveTuple.p4 | 0 .../five_tuple/fiveTuple_tinycam.p4 | 0 .../five_tuple/traffic_in.user | 0 {progs => p4-progs}/forward/cli_commands.txt | 0 {progs => p4-progs}/forward/forward.p4 | 0 .../forward/forward_tinycam.p4 | 0 {progs => p4-progs}/forward/traffic_in.user | 0 .../incorrect/unbound_var.sched | 0 .../incorrect/unbound_var_hier.sched | 0 .../incorrect/undeclared_classes.sched | 0 .../leaky_2_classes.sched | 0 .../non_work_conserving}/rcsp_4_classes.sched | 0 .../non_work_conserving}/sg_3_classes.sched | 0 .../token_2_rr_children.sched | 0 .../work_conserving}/drop_a_class.sched | 0 .../work_conserving}/fifo_1_class.sched | 0 .../work_conserving}/fifo_1_class_sugar.sched | 0 .../work_conserving}/fifo_n_classes.sched | 0 .../work_conserving}/rr_1_class.sched | 0 .../work_conserving}/rr_2_classes.sched | 0 .../work_conserving}/rr_hier.sched | 0 .../rr_hier_merge_sugar.sched | 0 .../work_conserving}/rr_hier_sugar.sched | 0 .../work_conserving}/rr_n_class_hier.sched | 0 .../work_conserving}/rr_n_classes.sched | 0 .../rr_strict_n_classes_hier.sched | 0 .../work_conserving}/strict_n_classes.sched | 0 59 files changed, 28 insertions(+), 29 deletions(-) rename {dsl_lang => dsl}/.ocamlformat (100%) rename {dsl_lang => dsl}/bin/dune (66%) rename {dsl_lang => dsl}/bin/main.ml (100%) rename dsl_lang/dsl_lang.opam => dsl/dsl.opam (100%) rename {dsl_lang => dsl}/dune-project (92%) rename {dsl_lang => dsl}/lib/ast.ml (100%) rename {dsl_lang => dsl}/lib/dune (100%) rename {dsl_lang => dsl}/lib/eval.ml (97%) rename {dsl_lang => dsl}/lib/lexer.mll (100%) rename {dsl_lang => dsl}/lib/parse.ml (100%) rename {dsl_lang => dsl}/lib/parser.mly (100%) rename {dsl_lang => dsl}/lib/util.ml (100%) rename {dsl_lang => dsl}/test/dune (100%) rename {dsl_lang => dsl}/test/well_formed.ml (50%) rename {progs => p4-progs}/advanced_calculator/advan_calc_user_externs.so (100%) rename {progs => p4-progs}/advanced_calculator/advanced_calculator.p4 (100%) rename {progs => p4-progs}/advanced_calculator/cli_commands.txt (100%) rename {progs => p4-progs}/advanced_calculator/traffic_in.user (100%) rename {progs => p4-progs}/calculator/calculator.p4 (100%) rename {progs => p4-progs}/calculator/cli_commands.txt (100%) rename {progs => p4-progs}/calculator/traffic_in.user (100%) rename {progs => p4-progs}/default/cli_commands.txt (100%) rename {progs => p4-progs}/default/default.p4 (100%) rename {progs => p4-progs}/default/traffic_in.user (100%) rename {progs => p4-progs}/echo/cli_commands.txt (100%) rename {progs => p4-progs}/echo/echo.p4 (100%) rename {progs => p4-progs}/echo/traffic_in.meta (100%) rename {progs => p4-progs}/echo/traffic_in.user (100%) rename {progs => p4-progs}/five_tuple/cli_commands.txt (100%) rename {progs => p4-progs}/five_tuple/fiveTuple.p4 (100%) rename {progs => p4-progs}/five_tuple/fiveTuple_tinycam.p4 (100%) rename {progs => p4-progs}/five_tuple/traffic_in.user (100%) rename {progs => p4-progs}/forward/cli_commands.txt (100%) rename {progs => p4-progs}/forward/forward.p4 (100%) rename {progs => p4-progs}/forward/forward_tinycam.p4 (100%) rename {progs => p4-progs}/forward/traffic_in.user (100%) rename {dsl/progs => progs}/incorrect/unbound_var.sched (100%) rename {dsl/progs => progs}/incorrect/unbound_var_hier.sched (100%) rename {dsl/progs => progs}/incorrect/undeclared_classes.sched (100%) rename {dsl/progs/nwc => progs/non_work_conserving}/leaky_2_classes.sched (100%) rename {dsl/progs/nwc => progs/non_work_conserving}/rcsp_4_classes.sched (100%) rename {dsl/progs/nwc => progs/non_work_conserving}/sg_3_classes.sched (100%) rename {dsl/progs/nwc => progs/non_work_conserving}/token_2_rr_children.sched (100%) rename {dsl/progs/now => progs/work_conserving}/drop_a_class.sched (100%) rename {dsl/progs/now => progs/work_conserving}/fifo_1_class.sched (100%) rename {dsl/progs/now => progs/work_conserving}/fifo_1_class_sugar.sched (100%) rename {dsl/progs/now => progs/work_conserving}/fifo_n_classes.sched (100%) rename {dsl/progs/now => progs/work_conserving}/rr_1_class.sched (100%) rename {dsl/progs/now => progs/work_conserving}/rr_2_classes.sched (100%) rename {dsl/progs/now => progs/work_conserving}/rr_hier.sched (100%) rename {dsl/progs/now => progs/work_conserving}/rr_hier_merge_sugar.sched (100%) rename {dsl/progs/now => progs/work_conserving}/rr_hier_sugar.sched (100%) rename {dsl/progs/soon => progs/work_conserving}/rr_n_class_hier.sched (100%) rename {dsl/progs/soon => progs/work_conserving}/rr_n_classes.sched (100%) rename {dsl/progs/soon => progs/work_conserving}/rr_strict_n_classes_hier.sched (100%) rename {dsl/progs/soon => progs/work_conserving}/strict_n_classes.sched (100%) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index a9368d0..c1cde09 100644 --- 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 index c90f791..cd4be1b 100644 --- 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 index c2ba089..c106168 100644 --- 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 b/dsl/.ocamlformat similarity index 100% rename from dsl_lang/.ocamlformat rename to dsl/.ocamlformat diff --git a/dsl_lang/bin/dune b/dsl/bin/dune similarity index 66% rename from dsl_lang/bin/dune rename to dsl/bin/dune index 842aeca..433c127 100644 --- a/dsl_lang/bin/dune +++ b/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 b/dsl/bin/main.ml similarity index 100% rename from dsl_lang/bin/main.ml rename to dsl/bin/main.ml diff --git a/dsl_lang/dsl_lang.opam b/dsl/dsl.opam similarity index 100% rename from dsl_lang/dsl_lang.opam rename to dsl/dsl.opam diff --git a/dsl_lang/dune-project b/dsl/dune-project similarity index 92% rename from dsl_lang/dune-project rename to dsl/dune-project index 8414931..617625d 100644 --- a/dsl_lang/dune-project +++ b/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 b/dsl/lib/ast.ml similarity index 100% rename from dsl_lang/lib/ast.ml rename to dsl/lib/ast.ml diff --git a/dsl_lang/lib/dune b/dsl/lib/dune similarity index 100% rename from dsl_lang/lib/dune rename to dsl/lib/dune diff --git a/dsl_lang/lib/eval.ml b/dsl/lib/eval.ml similarity index 97% rename from dsl_lang/lib/eval.ml rename to dsl/lib/eval.ml index 2468703..dc0b3ea 100644 --- a/dsl_lang/lib/eval.ml +++ b/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 b/dsl/lib/lexer.mll similarity index 100% rename from dsl_lang/lib/lexer.mll rename to dsl/lib/lexer.mll diff --git a/dsl_lang/lib/parse.ml b/dsl/lib/parse.ml similarity index 100% rename from dsl_lang/lib/parse.ml rename to dsl/lib/parse.ml diff --git a/dsl_lang/lib/parser.mly b/dsl/lib/parser.mly similarity index 100% rename from dsl_lang/lib/parser.mly rename to dsl/lib/parser.mly diff --git a/dsl_lang/lib/util.ml b/dsl/lib/util.ml similarity index 100% rename from dsl_lang/lib/util.ml rename to dsl/lib/util.ml diff --git a/dsl_lang/test/dune b/dsl/test/dune similarity index 100% rename from dsl_lang/test/dune rename to dsl/test/dune diff --git a/dsl_lang/test/well_formed.ml b/dsl/test/well_formed.ml similarity index 50% rename from dsl_lang/test/well_formed.ml rename to dsl/test/well_formed.ml index 8189493..c22bcbc 100644 --- a/dsl_lang/test/well_formed.ml +++ b/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/progs/advanced_calculator/advan_calc_user_externs.so b/p4-progs/advanced_calculator/advan_calc_user_externs.so similarity index 100% rename from progs/advanced_calculator/advan_calc_user_externs.so rename to p4-progs/advanced_calculator/advan_calc_user_externs.so diff --git a/progs/advanced_calculator/advanced_calculator.p4 b/p4-progs/advanced_calculator/advanced_calculator.p4 similarity index 100% rename from progs/advanced_calculator/advanced_calculator.p4 rename to p4-progs/advanced_calculator/advanced_calculator.p4 diff --git a/progs/advanced_calculator/cli_commands.txt b/p4-progs/advanced_calculator/cli_commands.txt similarity index 100% rename from progs/advanced_calculator/cli_commands.txt rename to p4-progs/advanced_calculator/cli_commands.txt diff --git a/progs/advanced_calculator/traffic_in.user b/p4-progs/advanced_calculator/traffic_in.user similarity index 100% rename from progs/advanced_calculator/traffic_in.user rename to p4-progs/advanced_calculator/traffic_in.user diff --git a/progs/calculator/calculator.p4 b/p4-progs/calculator/calculator.p4 similarity index 100% rename from progs/calculator/calculator.p4 rename to p4-progs/calculator/calculator.p4 diff --git a/progs/calculator/cli_commands.txt b/p4-progs/calculator/cli_commands.txt similarity index 100% rename from progs/calculator/cli_commands.txt rename to p4-progs/calculator/cli_commands.txt diff --git a/progs/calculator/traffic_in.user b/p4-progs/calculator/traffic_in.user similarity index 100% rename from progs/calculator/traffic_in.user rename to p4-progs/calculator/traffic_in.user diff --git a/progs/default/cli_commands.txt b/p4-progs/default/cli_commands.txt similarity index 100% rename from progs/default/cli_commands.txt rename to p4-progs/default/cli_commands.txt diff --git a/progs/default/default.p4 b/p4-progs/default/default.p4 similarity index 100% rename from progs/default/default.p4 rename to p4-progs/default/default.p4 diff --git a/progs/default/traffic_in.user b/p4-progs/default/traffic_in.user similarity index 100% rename from progs/default/traffic_in.user rename to p4-progs/default/traffic_in.user diff --git a/progs/echo/cli_commands.txt b/p4-progs/echo/cli_commands.txt similarity index 100% rename from progs/echo/cli_commands.txt rename to p4-progs/echo/cli_commands.txt diff --git a/progs/echo/echo.p4 b/p4-progs/echo/echo.p4 similarity index 100% rename from progs/echo/echo.p4 rename to p4-progs/echo/echo.p4 diff --git a/progs/echo/traffic_in.meta b/p4-progs/echo/traffic_in.meta similarity index 100% rename from progs/echo/traffic_in.meta rename to p4-progs/echo/traffic_in.meta diff --git a/progs/echo/traffic_in.user b/p4-progs/echo/traffic_in.user similarity index 100% rename from progs/echo/traffic_in.user rename to p4-progs/echo/traffic_in.user diff --git a/progs/five_tuple/cli_commands.txt b/p4-progs/five_tuple/cli_commands.txt similarity index 100% rename from progs/five_tuple/cli_commands.txt rename to p4-progs/five_tuple/cli_commands.txt diff --git a/progs/five_tuple/fiveTuple.p4 b/p4-progs/five_tuple/fiveTuple.p4 similarity index 100% rename from progs/five_tuple/fiveTuple.p4 rename to p4-progs/five_tuple/fiveTuple.p4 diff --git a/progs/five_tuple/fiveTuple_tinycam.p4 b/p4-progs/five_tuple/fiveTuple_tinycam.p4 similarity index 100% rename from progs/five_tuple/fiveTuple_tinycam.p4 rename to p4-progs/five_tuple/fiveTuple_tinycam.p4 diff --git a/progs/five_tuple/traffic_in.user b/p4-progs/five_tuple/traffic_in.user similarity index 100% rename from progs/five_tuple/traffic_in.user rename to p4-progs/five_tuple/traffic_in.user diff --git a/progs/forward/cli_commands.txt b/p4-progs/forward/cli_commands.txt similarity index 100% rename from progs/forward/cli_commands.txt rename to p4-progs/forward/cli_commands.txt diff --git a/progs/forward/forward.p4 b/p4-progs/forward/forward.p4 similarity index 100% rename from progs/forward/forward.p4 rename to p4-progs/forward/forward.p4 diff --git a/progs/forward/forward_tinycam.p4 b/p4-progs/forward/forward_tinycam.p4 similarity index 100% rename from progs/forward/forward_tinycam.p4 rename to p4-progs/forward/forward_tinycam.p4 diff --git a/progs/forward/traffic_in.user b/p4-progs/forward/traffic_in.user similarity index 100% rename from progs/forward/traffic_in.user rename to p4-progs/forward/traffic_in.user diff --git a/dsl/progs/incorrect/unbound_var.sched b/progs/incorrect/unbound_var.sched similarity index 100% rename from dsl/progs/incorrect/unbound_var.sched rename to progs/incorrect/unbound_var.sched diff --git a/dsl/progs/incorrect/unbound_var_hier.sched b/progs/incorrect/unbound_var_hier.sched similarity index 100% rename from dsl/progs/incorrect/unbound_var_hier.sched rename to progs/incorrect/unbound_var_hier.sched diff --git a/dsl/progs/incorrect/undeclared_classes.sched b/progs/incorrect/undeclared_classes.sched similarity index 100% rename from dsl/progs/incorrect/undeclared_classes.sched rename to progs/incorrect/undeclared_classes.sched diff --git a/dsl/progs/nwc/leaky_2_classes.sched b/progs/non_work_conserving/leaky_2_classes.sched similarity index 100% rename from dsl/progs/nwc/leaky_2_classes.sched rename to progs/non_work_conserving/leaky_2_classes.sched diff --git a/dsl/progs/nwc/rcsp_4_classes.sched b/progs/non_work_conserving/rcsp_4_classes.sched similarity index 100% rename from dsl/progs/nwc/rcsp_4_classes.sched rename to progs/non_work_conserving/rcsp_4_classes.sched diff --git a/dsl/progs/nwc/sg_3_classes.sched b/progs/non_work_conserving/sg_3_classes.sched similarity index 100% rename from dsl/progs/nwc/sg_3_classes.sched rename to progs/non_work_conserving/sg_3_classes.sched diff --git a/dsl/progs/nwc/token_2_rr_children.sched b/progs/non_work_conserving/token_2_rr_children.sched similarity index 100% rename from dsl/progs/nwc/token_2_rr_children.sched rename to progs/non_work_conserving/token_2_rr_children.sched diff --git a/dsl/progs/now/drop_a_class.sched b/progs/work_conserving/drop_a_class.sched similarity index 100% rename from dsl/progs/now/drop_a_class.sched rename to progs/work_conserving/drop_a_class.sched diff --git a/dsl/progs/now/fifo_1_class.sched b/progs/work_conserving/fifo_1_class.sched similarity index 100% rename from dsl/progs/now/fifo_1_class.sched rename to progs/work_conserving/fifo_1_class.sched diff --git a/dsl/progs/now/fifo_1_class_sugar.sched b/progs/work_conserving/fifo_1_class_sugar.sched similarity index 100% rename from dsl/progs/now/fifo_1_class_sugar.sched rename to progs/work_conserving/fifo_1_class_sugar.sched diff --git a/dsl/progs/now/fifo_n_classes.sched b/progs/work_conserving/fifo_n_classes.sched similarity index 100% rename from dsl/progs/now/fifo_n_classes.sched rename to progs/work_conserving/fifo_n_classes.sched diff --git a/dsl/progs/now/rr_1_class.sched b/progs/work_conserving/rr_1_class.sched similarity index 100% rename from dsl/progs/now/rr_1_class.sched rename to progs/work_conserving/rr_1_class.sched diff --git a/dsl/progs/now/rr_2_classes.sched b/progs/work_conserving/rr_2_classes.sched similarity index 100% rename from dsl/progs/now/rr_2_classes.sched rename to progs/work_conserving/rr_2_classes.sched diff --git a/dsl/progs/now/rr_hier.sched b/progs/work_conserving/rr_hier.sched similarity index 100% rename from dsl/progs/now/rr_hier.sched rename to progs/work_conserving/rr_hier.sched diff --git a/dsl/progs/now/rr_hier_merge_sugar.sched b/progs/work_conserving/rr_hier_merge_sugar.sched similarity index 100% rename from dsl/progs/now/rr_hier_merge_sugar.sched rename to progs/work_conserving/rr_hier_merge_sugar.sched diff --git a/dsl/progs/now/rr_hier_sugar.sched b/progs/work_conserving/rr_hier_sugar.sched similarity index 100% rename from dsl/progs/now/rr_hier_sugar.sched rename to progs/work_conserving/rr_hier_sugar.sched diff --git a/dsl/progs/soon/rr_n_class_hier.sched b/progs/work_conserving/rr_n_class_hier.sched similarity index 100% rename from dsl/progs/soon/rr_n_class_hier.sched rename to progs/work_conserving/rr_n_class_hier.sched diff --git a/dsl/progs/soon/rr_n_classes.sched b/progs/work_conserving/rr_n_classes.sched similarity index 100% rename from dsl/progs/soon/rr_n_classes.sched rename to progs/work_conserving/rr_n_classes.sched diff --git a/dsl/progs/soon/rr_strict_n_classes_hier.sched b/progs/work_conserving/rr_strict_n_classes_hier.sched similarity index 100% rename from dsl/progs/soon/rr_strict_n_classes_hier.sched rename to progs/work_conserving/rr_strict_n_classes_hier.sched diff --git a/dsl/progs/soon/strict_n_classes.sched b/progs/work_conserving/strict_n_classes.sched similarity index 100% rename from dsl/progs/soon/strict_n_classes.sched rename to progs/work_conserving/strict_n_classes.sched