Added support for modular scheduler in C runtime #743

Soroosh129 · 2021-11-11T05:55:28Z

This PR adds the bare-minimum ability to change the runtime scheduler when supported.

The main features of this PR are:

A scheduler target property
-s and --scheduler lfc command-line arguments
Testing of all supported schedulers for the C target using LF tests (in concurrent, multiport, and federated categories)
Minor updates and tweaks to the testing framework (for example, to show exit code)
Updated references of reactor-c and reactor-c-py

Please see the PR in reactor-c for more details about the schedulers themselves.

FIXME: Update test framework (pass CLI arg to test) and c-tests.yml so that caller can specify which scheduler to use

Using a still new and very rough but functional multi-threaded scheduler

…scheduler

org.lflang.tests/src/org/lflang/tests/AbstractTest.java

…tem properties to select a specific scheduler

lhstrh

This all looks good to me, but I got really stuck while reviewing the changes in ReactionInstanceGraph...

benchmark/runner/conf/default.yaml

org.lflang/src/org/lflang/generator/c/CGenerator.xtend

test/C/src/Deadline.lf

org.lflang/src/org/lflang/FileConfig.java

org.lflang/src/org/lflang/generator/ReactionInstanceGraph.java

org.lflang/src/org/lflang/generator/python/PythonGenerator.xtend

edwardalee

@lhstrh and I have made a pass over this and I believe it is ready to merge. The c-new-scheduler branch of reactor-c should be merged first and then the reactor-c pointer updated to point to reactor-c/main.

org.lflang/src/org/lflang/generator/ReactorInstance.java

Soroosh129 added 30 commits November 10, 2021 01:27

First prototype of the scheduler

651f16b

Updated reactor c submodule

5945c88

Using a still new and very rough but functional multi-threaded scheduler

Updated reactor-c

1423230

Merge remote-tracking branch 'origin/master' into c-new-scheduler

cfe3952

Updated reactor c

449e34c

Removed tracing from benchmark

b87e13f

Updated reactor-c

796d272

Updated reactor-c

2978eb0

Merge remote-tracking branch 'origin/master' into c-new-scheduler

ee39e7c

Updated reactor-c

70d32d8

Adjusted path to util files

3ea5ded

Updated reactor-c

ddb6936

Updated reactor-c-py

8fc8b8e

Updated reactor-c

a651939

Check that Python functions are loaded properly

1875e75

Merge remote-tracking branch 'origin/master' into c-new-scheduler

ebe8042

Updated reactor-c

427a2f2

Updated reactor-c

ab2ae61

FIXME: The performance of TimeLimitThreaded is terrible with the new …

572c1e6

…scheduler

Updated reactor-c

5e5b70e

Added a scheduler.h

a63303d

Updated reactor-c-py

3029508

Updated test since port values are read-only

cdaa951

Space in comment

6a74edf

Updated reactor-c

5c35c25

Added a scheduler target property

8ddb81f

Added support for swapping schedulers to the CGenerator

43ed890

Updated reactor-c

56ad39f

Merge remote-tracking branch 'origin/master' into c-new-scheduler

31889bd

Fixed compile error

ff098e9

Merge remote-tracking branch 'origin/master' into c-new-scheduler

6a14473

petervdonovan reviewed Feb 12, 2022

View reviewed changes

org.lflang.tests/src/org/lflang/tests/AbstractTest.java Outdated Show resolved Hide resolved

lhstrh added 8 commits February 12, 2022 23:47

Created separate test for non-standard schedulers that listens to sys…

906b6fb

…tem properties to select a specific scheduler

Use 4 threads for scheduler tests

dbb9017

Parameterized C tests workflow with scheduler option

bc08e64

Resolved merge conflict

6363b45

IntelliJ refactoring ignores Xtend files; provided manual fix

79b9bed

Fix typo

6a9e4d9

Fix compile error

108b026

Echo specified scheduler

3e9d836

lhstrh reviewed Feb 17, 2022

View reviewed changes

Soroosh129 commented Feb 17, 2022

View reviewed changes

org.lflang/src/org/lflang/generator/python/PythonGenerator.xtend Outdated Show resolved Hide resolved

edwardalee and others added 2 commits February 25, 2022 17:06

Attempt to resolve merge conflicts with master. Tests not passing

dd64983

Attempt to fix merge artifact

b65274a

Soroosh129 force-pushed the c-new-scheduler branch from 76dec70 to b65274a Compare February 26, 2022 05:33

Moved check

980097a

lhstrh mentioned this pull request Feb 26, 2022

Simplify dealings with reactor-c files and scheduler selection #983

Open

Soroosh129 and others added 5 commits February 26, 2022 00:23

Revert incorrect tests

27e74f5

Reverted continue_on_error

2778331

set to point to c-new-scheduler branch of reactor-c

61a5ed5

Renamed max levels to num levels

9af2f83

Fixed suspicious methods for adjusting number of levels count.

34bb15a

edwardalee approved these changes Feb 26, 2022

View reviewed changes

org.lflang/src/org/lflang/generator/ReactorInstance.java Outdated Show resolved Hide resolved

Point to reactor-c main branch, which now has c-new-scheduler merged in

900c449

lhstrh approved these changes Feb 26, 2022

View reviewed changes

edwardalee merged commit 14e26fe into master Feb 26, 2022

edwardalee deleted the c-new-scheduler branch February 26, 2022 20:52

lhstrh mentioned this pull request Mar 17, 2022

Create an automated release workflow #338

Closed

lhstrh changed the title ~~C new scheduler~~ Added support for modular scheduler in C runtime Mar 17, 2022

lhstrh added the enhancement Enhancement of existing feature label Mar 17, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added support for modular scheduler in C runtime #743

Added support for modular scheduler in C runtime #743

Soroosh129 commented Nov 11, 2021 •

edited by lhstrh

Loading

lhstrh left a comment

edwardalee left a comment

Added support for modular scheduler in C runtime #743

Added support for modular scheduler in C runtime #743

Conversation

Soroosh129 commented Nov 11, 2021 • edited by lhstrh Loading

lhstrh left a comment

Choose a reason for hiding this comment

edwardalee left a comment

Choose a reason for hiding this comment

Soroosh129 commented Nov 11, 2021 •

edited by lhstrh

Loading