Skip to content

LogicSegment: Use portable code for raw sample access #2

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

Open
zeldin wants to merge 1 commit into
base: RLE
Choose a base branch
from
Open

LogicSegment: Use portable code for raw sample access #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions pv/data/logicsegment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,18 @@ LogicSegment::Edge* LogicSegment::add_state_to_sub_signal(RLEData* rle_data,
return e;
}

uint64_t LogicSegment::get_64_samples(const uint8_t *ptr, uint64_t sample_mask)
{
uint64_t r = 0;
int n = 0;
while (sample_mask != 0) {
r |= (((uint64_t)*ptr++) & sample_mask) << n;
n += 8;
sample_mask >>= 8;
}
return r;
}

void LogicSegment::process_new_samples(void *data, uint64_t samples)
{
// To iterate over the sample data, we use uint64 to compare up to 64 signals at a time
Expand All @@ -533,7 +545,7 @@ void LogicSegment::process_new_samples(void *data, uint64_t samples)

if (sub_signals_.at(start_signal).edge_count == 0) {
// Sub-signals are empty, use the current state as initial state
const uint64_t sample_value = (*(uint64_t*)ptr) & sample_mask;
const uint64_t sample_value = get_64_samples(ptr, sample_mask);

prev_sample_value_.push_back(sample_value);
prev_value = sample_value;
Expand Down Expand Up @@ -568,7 +580,7 @@ void LogicSegment::process_new_samples(void *data, uint64_t samples)
uint64_t same_sample_count = 0;

for (uint64_t i = 0; i < samples; i++) {
const uint64_t sample_value = (*(uint64_t*)ptr) & sample_mask;
const uint64_t sample_value = get_64_samples(ptr, sample_mask);

if (sample_value == prev_value) {
// Sample value hasn't changed
Expand Down
3 changes: 3 additions & 0 deletions pv/data/logicsegment.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ class LogicSegment : public Segment
Edge* add_state_to_sub_signal(RLEData* rle_data, uint64_t samplenum,
bool state, uint64_t length);

static inline uint64_t get_64_samples(const uint8_t *ptr,
uint64_t sample_mask);

void process_new_samples(void *data, uint64_t samples);

private:
Expand Down