Skip to content
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.

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

repair thread test for make test-more #880

Merged
merged 1 commit into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ jobs:
os: windows-2022
toolchain: gcc
configure: CFLAGS+=-std=gnu89
- machine: ta6le
os: ubuntu-22.04
test: test-more
variant: more
runs-on: ${{ matrix.config.os }}
env:
TARGET_MACHINE: ${{ matrix.config.machine }}
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/summarytest-more
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
-------- o=0 spi=t spi --------
-------- o=3 spi=t spi --------
-------- o=0 hci=503 ctb=(/ (collect-trip-bytes) 64) cl=9 ctb --------
-------- o=3 hci=503 ctb=(/ (collect-trip-bytes) 64) cl=9 ctb --------
-------- o=0 spi=t cis=t cmg=1 cis --------
-------- o=3 spi=t cis=t cmg=1 cis --------
-------- o=0 hci=101 cis=t cmg=6 hci-cis --------
-------- o=3 hci=101 cis=t cmg=6 hci-cis --------
-------- o=0 spi=t cp0=t ctb=(/ (collect-trip-bytes) 64) cgr=6 ctb-cgr --------
-------- o=3 spi=t cp0=t ctb=(/ (collect-trip-bytes) 64) cgr=6 ctb-cgr --------
-------- o=0 spi=t hci=101 p=t eoc=f hci-p --------
-------- o=3 spi=t hci=101 p=t eoc=f hci-p --------
-------- o=0 hci=101 cp0=t p=t cl=9 hci-cl-p --------
-------- o=3 hci=101 cp0=t p=t cl=9 hci-cl-p --------
-------- o=0 eval=interpret spi --------
-------- o=3 eval=interpret spi --------
-------- o=0 cp0=t eval=interpret spi-cp0 --------
-------- o=3 cp0=t eval=interpret spi-cp0 --------
-------- o=0 spi=t hci=503 eval=interpret ctb=(/ (collect-trip-bytes) 64) spi-ctb --------
-------- o=3 spi=t hci=503 eval=interpret ctb=(/ (collect-trip-bytes) 64) spi-ctb --------
-------- o=0 spi=t hci=101 cp0=t p=t eval=interpret cgr=2 hci-cgr-p --------
-------- o=3 spi=t hci=101 cp0=t p=t eval=interpret cgr=2 hci-cgr-p --------
2 changes: 1 addition & 1 deletion c/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
# define BIG_ENDIAN_IEEE_DOUBLE
#endif

#if defined(__arm64__) && defined(__clang__) && (__clang_major__ == 15)
#if defined(__arm64__) && defined(__clang__) && (__clang_major__ == 15) && defined(__apple_build_version__)
# define USE_PAR_SWEEPERS_WORKAROUND
#endif

Expand Down
5 changes: 4 additions & 1 deletion mats/thread.ms
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,10 @@
(equal?
;; Create threads that refer to data owned by other threads, and try to
;; mix things up to see if we can provoke a problem in parallel collection.
(parameterize ([collect-request-handler (lambda () (collect 3 1 3))])
(parameterize ([collect-request-handler
(lambda ()
(let ([g (collect-maximum-generation)])
(collect (- g 1) (min 1 (- g 1)) (- g 1))))])
(let loop ([j 50])
(unless (= j 0)
(let* ([N 8]
Expand Down
Loading