Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hxcomm
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EBRAINS RI
Tech Hub
Apps
BrainScaleS
hxcomm
Commits
680bdcfd
Commit
680bdcfd
authored
2 years ago
by
Tobias Thommes
Browse files
Options
Downloads
Patches
Plain Diff
Add support for systime-correction barrier
Depends-On: 18737 Change-Id: I07b04fa8ae63c5457c3a67d4bbc04c72adc34913
parent
573ad9e5
No related branches found
Branches containing commit
Tags
ebrains-4.0-a4
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/hxcomm/vx/instruction/timing.h
+6
-5
6 additions, 5 deletions
include/hxcomm/vx/instruction/timing.h
tests/hw/hxcomm/test-barrier.cpp
+3
-0
3 additions, 0 deletions
tests/hw/hxcomm/test-barrier.cpp
tests/sw/hxcomm/test-payload_ostream.cpp
+1
-1
1 addition, 1 deletion
tests/sw/hxcomm/test-payload_ostream.cpp
with
10 additions
and
6 deletions
include/hxcomm/vx/instruction/timing.h
+
6
−
5
View file @
680bdcfd
...
...
@@ -31,12 +31,13 @@ struct SystimeInit
/** Block further execution until specified set of communication channels is idle. */
struct
Barrier
{
constexpr
static
size_t
size
=
4
;
constexpr
static
size_t
size
=
5
;
typedef
hxcomm
::
instruction
::
detail
::
payload
::
Bitset
<
Barrier
,
size
>
Payload
;
constexpr
static
Payload
omnibus
{
0b0001
};
constexpr
static
Payload
jtag
{
0b0010
};
constexpr
static
Payload
systime
{
0b0100
};
constexpr
static
Payload
multi_fpga
{
0b1000
};
constexpr
static
Payload
omnibus
{
0b00001
};
constexpr
static
Payload
jtag
{
0b00010
};
constexpr
static
Payload
systime
{
0b00100
};
constexpr
static
Payload
multi_fpga
{
0b01000
};
constexpr
static
Payload
systime_correction
{
0b10000
};
};
/**
...
...
This diff is collapsed.
Click to expand it.
tests/hw/hxcomm/test-barrier.cpp
+
3
−
0
View file @
680bdcfd
...
...
@@ -30,6 +30,9 @@ TEST(TestConnection, Barrier)
// block until Multi_FPGA is idle
run
(
UTMessageToFPGA
<
timing
::
Barrier
>
(
timing
::
Barrier
::
multi_fpga
));
// block until Systime Correction is idle
run
(
UTMessageToFPGA
<
timing
::
Barrier
>
(
timing
::
Barrier
::
systime_correction
));
};
auto
connection
=
get_connection_full_stream_interface_from_env
();
...
...
This diff is collapsed.
Click to expand it.
tests/sw/hxcomm/test-payload_ostream.cpp
+
1
−
1
View file @
680bdcfd
...
...
@@ -19,7 +19,7 @@ std::unordered_map<std::type_index, std::string> expected_string_representation
{
typeid
(
timing
::
Setup
),
"hxcomm::vx::instruction::timing::Setup()"
},
{
typeid
(
timing
::
WaitUntil
),
"hxcomm::vx::instruction::timing::WaitUntil(0)"
},
{
typeid
(
timing
::
SystimeInit
),
"hxcomm::vx::instruction::timing::SystimeInit(0)"
},
{
typeid
(
timing
::
Barrier
),
"hxcomm::vx::instruction::timing::Barrier(0000)"
},
{
typeid
(
timing
::
Barrier
),
"hxcomm::vx::instruction::timing::Barrier(0000
0
)"
},
{
typeid
(
timing
::
PollingOmnibusBlock
),
"hxcomm::vx::instruction::timing::PollingOmnibusBlock(0)"
},
{
typeid
(
system
::
Loopback
),
"hxcomm::vx::instruction::system::Loopback(0)"
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment