From 65c13fdff1b24d2245b21fd0122427db09d51939 Mon Sep 17 00:00:00 2001 From: Scott Haseley Date: Wed, 22 Mar 2017 15:02:48 -0400 Subject: [PATCH] Splitting ASST3 into multiple subtargets and redistributing points --- test161/targets/asst3.1.tt | 31 ++++++++++++ test161/targets/asst3.2.tt | 55 +++++++++++++++++++++ test161/targets/asst3.3.tt | 37 ++++++++++++++ test161/targets/asst3.tt | 99 ++------------------------------------ 4 files changed, 126 insertions(+), 96 deletions(-) create mode 100644 test161/targets/asst3.1.tt create mode 100644 test161/targets/asst3.2.tt create mode 100644 test161/targets/asst3.3.tt diff --git a/test161/targets/asst3.1.tt b/test161/targets/asst3.1.tt new file mode 100644 index 0000000..c9df49d --- /dev/null +++ b/test161/targets/asst3.1.tt @@ -0,0 +1,31 @@ +name: asst3.1 +print_name: ASST3.1 +description: > + In this part of ASST3, you will begin writing your own VM by adding your + coremap and page allocator. +version: 1 +points: 60 +type: asst +kconfig: ASST3 +userland: true +meta_name: asst3 +leaderboard: false +tests: + - id: coremap/not-dumbvm.t + points: 15 + - id: coremap/km1.t + points: 5 + mem_leak_points: 2 + - id: coremap/km2.t + points: 5 + mem_leak_points: 2 + - id: coremap/km3.t + points: 5 + mem_leak_points: 2 + - id: coremap/km4.t + points: 15 + mem_leak_points: 2 + - id: coremap/coremap-loose.t + points: 5 + - id: coremap/coremap-tight.t + points: 10 diff --git a/test161/targets/asst3.2.tt b/test161/targets/asst3.2.tt new file mode 100644 index 0000000..d2afa8f --- /dev/null +++ b/test161/targets/asst3.2.tt @@ -0,0 +1,55 @@ +name: asst3.2 +print_name: ASST3.2 +description: > + In this part of ASST3, you will add virtual address spaces to your VM. +version: 1 +points: 120 +type: asst +kconfig: ASST3 +userland: true +meta_name: asst3 +leaderboard: false +tests: +# Basic VM (30 points) + - id: vm/not-dumbvm-vm.t + points: 5 + - id: vm/sort.t + points: 5 + - id: vm/palin.t + points: 5 + - id: vm/matmult.t + mem_leak_points: 2 + points: 5 + - id: vm/ctest.t + points: 5 + - id: vm/stacktest.t + points: 5 + +# Concurrent VM (50 points) + - id: vm/bigfork.t + points: 10 + mem_leak_points: 2 + - id: vm/parallelvm.t + points: 10 + - id: vm/quintsort.t + points: 10 + - id: vm/quintmat.t + points: 10 + - id: vm/quinthuge.t + points: 10 + +# Heap (10 points) + - id: vm/sbrktest.t + points: 8 + mem_leak_points: 2 + - id: vm/sbrk-badcall.t + points: 2 + +# Stress tests/misc (30 points) + - id: vm/zero.t + points: 5 + - id: vm/stability/vm-stability.t + points: 20 + mem_leak_points: 2 + - id: vm/stability/forkbomb.t + points: 5 diff --git a/test161/targets/asst3.3.tt b/test161/targets/asst3.3.tt new file mode 100644 index 0000000..5d64db8 --- /dev/null +++ b/test161/targets/asst3.3.tt @@ -0,0 +1,37 @@ +name: asst3.3 +print_name: ASST3.3 +description: > + In this part of ASST3, you will add swapping to your VM. +version: 1 +points: 120 +type: asst +kconfig: ASST3 +userland: true +meta_name: asst3 +leaderboard: false +tests: +# Basic Swapping (40 points) + - id: vm/swap/sort.t + mem_leak_points: 2 + points: 20 + - id: vm/swap/matmult.t + mem_leak_points: 2 + points: 20 + +# Concurrent Swapping (80 points) + - id: vm/swap/bigfork.t + points: 10 + - id: vm/swap/bigfork-32.t + points: 15 + mem_leak_points: 2 + - id: vm/swap/parallelvm.t + points: 10 + - id: vm/swap/parallelvm-32.t + points: 15 + - id: vm/swap/quintsort.t + points: 10 + - id: vm/swap/quintmat.t + points: 10 + - id: vm/swap/quinthuge.t + points: 10 + mem_leak_points: 2 diff --git a/test161/targets/asst3.tt b/test161/targets/asst3.tt index d4cbdc1..0c92b9c 100644 --- a/test161/targets/asst3.tt +++ b/test161/targets/asst3.tt @@ -3,103 +3,10 @@ print_name: ASST3 description: > In this assignment you will add support for virtual memory to your OS/161 kernel. -version: 3 +version: 4 points: 300 type: asst kconfig: ASST3 userland: true -tests: -# Checkpoint 1 (100 points) - - - id: coremap/not-dumbvm.t - points: 20 - - id: coremap/km1.t - points: 10 - mem_leak_points: 2 - - id: coremap/km2.t - points: 10 - mem_leak_points: 2 - - id: coremap/km3.t - points: 10 - mem_leak_points: 2 - - id: coremap/km4.t - points: 25 - mem_leak_points: 2 - - id: coremap/coremap-loose.t - points: 10 - - id: coremap/coremap-tight.t - points: 15 - -# Checkpoint 2 (100 points) - -# Basic VM (30 points) - - id: vm/not-dumbvm-vm.t - points: 5 - - id: vm/sort.t - points: 5 - - id: vm/palin.t - points: 5 - - id: vm/matmult.t - mem_leak_points: 2 - points: 5 - - id: vm/ctest.t - points: 5 - - id: vm/stacktest.t - points: 5 - -# Concurrent VM (40 points) - - id: vm/bigfork.t - points: 8 - mem_leak_points: 2 - - id: vm/parallelvm.t - points: 8 - - id: vm/quintsort.t - points: 8 - - id: vm/quintmat.t - points: 8 - - id: vm/quinthuge.t - points: 8 - -# Heap (10 points) - - id: vm/sbrktest.t - points: 8 - mem_leak_points: 2 - - id: vm/sbrk-badcall.t - points: 2 - -# Stress tests/misc (20 points) - - id: vm/zero.t - points: 5 - - id: vm/stability/vm-stability.t - points: 10 - mem_leak_points: 2 - - id: vm/stability/forkbomb.t - points: 5 - -# Checkpoint 3 (100 points) - -# Basic Swapping (30 points) - - id: vm/swap/sort.t - mem_leak_points: 2 - points: 15 - - id: vm/swap/matmult.t - mem_leak_points: 2 - points: 15 - -# Concurrent Swapping (70 points) - - id: vm/swap/bigfork.t - points: 10 - - id: vm/swap/bigfork-32.t - points: 10 - mem_leak_points: 2 - - id: vm/swap/parallelvm.t - points: 10 - - id: vm/swap/parallelvm-32.t - points: 10 - - id: vm/swap/quintsort.t - points: 10 - - id: vm/swap/quintmat.t - points: 10 - - id: vm/swap/quinthuge.t - points: 10 - mem_leak_points: 2 +is_meta_target: true +sub_target_names: ["asst3.1", "asst3.2", "asst3.3"]