Skip to content

Tce selftest fix #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karihepola merged 4 commits into from
Mar 9, 2026
Merged

Tce selftest fix #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab93136
Update the functionality of the explorer tool in oa-selftest script
karihepola Mar 6, 2026
9393350
Add oa-selftest to the CI pipeline
karihepola Mar 6, 2026
c58ab3c
Fix a IVERILOG env variable typo in tcetest_rfgen script
karihepola Mar 6, 2026
6678359
Update .github/workflows/ci.yml
karihepola Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- main
pull_request:
branches:
- main
- [main, openasip-2.2]
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -111,6 +111,10 @@ jobs:
cd openasip
python3 ./tools/scripts/install_qemu.py $HOME/qemu-openasip

- name: oa-selftest
run: |
oa-selftest -v -f

- name: Unit tests
run: |
cd openasip/test
Expand Down
48 changes: 24 additions & 24 deletions openasip/scripts/oa-selftest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,20 +365,20 @@ class TestExplorer(TCETestCase):
takes a while!)
"""
# Generate .idf using the ImplementationSelector plugin
command = 'explore -e ImplementationSelector -a {0} -s1 test.dsdb'.format(self.get_minimalADF())
command = 'explore -v -e ImplementationSelector -a {0} -s1 test.dsdb'.format(self.get_minimalADF())
(timeout, stdout, stderr, code) = self.runWithTimeout(command, 120)
self.assertTrue('Best result configurations:' in stdout)
self.assertTrue('2' in stdout)
self.assertEqual(stderr.strip(), '')
self.assertTrue('Best result configurations:' in stderr)
self.assertTrue('2' in stderr)
self.assertEqual(stdout.strip(), '')
self.assertEqual(code, 0)

# Dump the .idf a file.
(timeout, stdout, stderr, code) = self.runWithTimeout(
'explore -w 2 test.dsdb', 120)
self.assertEqual(stderr.strip(), '')
'explore -v -w 2 test.dsdb', 120)
self.assertEqual(stdout.strip(), '')
self.assertEqual(code, 0)
self.assertTrue('Written ADF file of configuration 2' in stdout)
self.assertTrue('Written IDF file of configuration 2' in stdout)
self.assertTrue('Written ADF file of configuration 2' in stderr)
self.assertTrue('Written IDF file of configuration 2' in stderr)
self.assertTrue(os.path.exists('2.adf'))
self.assertTrue(os.path.exists('2.idf'))

Expand Down Expand Up @@ -483,21 +483,21 @@ class TestEstimator(TCETestCase):
"""

# Generate .idf using explorer
command = 'explore -e ImplementationSelector -a {0} -s 1 test.dsdb'.format(self.get_bigEndianMinimalADF())
command = 'explore -v -e ImplementationSelector -a {0} -s 1 test.dsdb'.format(self.get_bigEndianMinimalADF())
(timeout, stdout, stderr, code) = self.runWithTimeout(command, 120)
self.assertTrue('Best result configurations:' in stdout)
self.assertTrue('2' in stdout)
self.assertEqual(stderr.strip(), '')
self.assertTrue('Best result configurations:' in stderr)
self.assertTrue('2' in stderr)
self.assertEqual(stdout.strip(), '')
self.assertEqual(code, 0)

# Dump the .idf a file.
(timeout, stdout, stderr, code) = self.runWithTimeout(
'explore -w 2 test.dsdb', 60
'explore -v -w 2 test.dsdb', 60
)
self.assertEqual(stderr.strip(), '')
self.assertEqual(stdout.strip(), '')
self.assertEqual(code, 0)
self.assertTrue('Written ADF file of configuration 2' in stdout)
self.assertTrue('Written IDF file of configuration 2' in stdout)
self.assertTrue('Written ADF file of configuration 2' in stderr)
self.assertTrue('Written IDF file of configuration 2' in stderr)
self.assertTrue(os.path.exists('2.adf'))
self.assertTrue(os.path.exists('2.idf'))

Expand Down Expand Up @@ -547,21 +547,21 @@ class TestProGeAndPIG(TCETestCase):
"""

# Generate .idf using the ImplementationSelector plugin
command = 'explore -e ImplementationSelector -a {0} -s1 test.dsdb'.format(
command = 'explore -v -e ImplementationSelector -a {0} -s1 test.dsdb'.format(
self.get_minimalADF())
(timeout, stdout, stderr, code) = self.runWithTimeout(command, 120)
self.assertTrue('Best result configurations:' in stdout)
self.assertTrue('2' in stdout)
self.assertEqual(stderr.strip(), '')
self.assertTrue('Best result configurations:' in stderr)
self.assertTrue('2' in stderr)
self.assertEqual(stdout.strip(), '')
self.assertEqual(code, 0)

# Dump the .idf a file.
(timeout, stdout, stderr, code) = self.runWithTimeout(
'explore -w 2 test.dsdb', 120)
self.assertEqual(stderr.strip(), '')
'explore -v -w 2 test.dsdb', 120)
self.assertEqual(stdout.strip(), '')
self.assertEqual(code, 0)
self.assertTrue('Written ADF file of configuration 2' in stdout)
self.assertTrue('Written IDF file of configuration 2' in stdout)
self.assertTrue('Written ADF file of configuration 2' in stderr)
self.assertTrue('Written IDF file of configuration 2' in stderr)
self.assertTrue(os.path.exists('2.adf'))
self.assertTrue(os.path.exists('2.idf'))

Expand Down
2 changes: 1 addition & 1 deletion testsuite/systemtest_long/procgen/RFGen/tcetest_rfgen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function run_verilog_test() {

# If iverilog is found from PATH, compile and simulate
IVERILOG=$(which iverilog 2> /dev/null)
if [ "x${GHDL}" != "x" ]
if [ "x${IVERILOG}" != "x" ]
then
cd $PROGE_OUT || exit 1
./iverilog_compile.sh >& /dev/null || echo "iverilog compile failed."
Expand Down