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.

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

[cilkscale] Fix Cilkscale debug build after recent code cleanup. #51

Merged
merged 2 commits into from
Jan 16, 2025
Merged

[cilkscale] Fix Cilkscale debug build after recent code cleanup. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef6863
[cilkscale] Fix Cilkscale debug build after recent code cleanup.
neboat Jan 12, 2025
ea02835
[benchmark] Fix Timer member variable in SERAL_TOOL build.
neboat Jan 13, 2025
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
2 changes: 1 addition & 1 deletion cilkscale/benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class BenchmarkImplT {
// Timer for tracking execution time.
cilkscale_timer_t Start, Stop;
#if SERIAL_TOOL
cilkscale_timer_t timer;
cilkscale_timer_t Timer;
#else
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wcilk-ignored"
Expand Down
8 changes: 4 additions & 4 deletions cilkscale/cilkscale.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static void printAnalysis(void) {
assert(CILKSCALE_INITIALIZED);
shadow_stack_frame_t &Bottom = Tool->ShadowStack.peek_bot();

assert(frame_type::NONE != bottom.type);
assert(frame_type::NONE != Bottom.type);

cilk_time_t Work = Bottom.contin_work;
cilk_time_t Span = Bottom.contin_span;
Expand Down Expand Up @@ -279,8 +279,8 @@ void __csi_func_exit(const csi_id_t func_exit_id, const csi_id_t func_id,

duration_t StrandTime = Tool->ShadowStack.elapsed_time();

assert(cilk_time_t::zero() == tool->shadow_stack.peek_bot().lchild_span);
assert(cilk_time_t::zero() == tool->shadow_stack.peek_bot().achild_work);
assert(cilk_time_t::zero() == Tool->ShadowStack.peek_bot().lchild_span);
assert(cilk_time_t::zero() == Tool->ShadowStack.peek_bot().achild_work);

// Pop the stack
shadow_stack_frame_t &CBottom = Tool->ShadowStack.pop();
Expand Down Expand Up @@ -355,7 +355,7 @@ void __csi_task_exit(const csi_id_t task_exit_id, const csi_id_t task_id,
Bottom.contin_span += StrandTime;
Bottom.contin_bspan += StrandTime;

assert(cilk_time_t::zero() == bottom.lchild_span);
assert(cilk_time_t::zero() == Bottom.lchild_span);

// Pop the stack
shadow_stack_frame_t &CBottom = Tool->ShadowStack.pop();
Expand Down
Loading