Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5a5c289c9e9d
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 217f06f1f057
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 16, 2020

  1. Disabled OMP in PrepareGeometry as it seemed to make things worse

    @azonenberg
    azonenberg committed May 16, 2020
    Copy the full SHA
    217f06f View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 glscopeclient/WaveformArea_rendering.cpp
5 changes: 2 additions & 3 deletions glscopeclient/WaveformArea_rendering.cpp
View file
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@ void WaveformArea::PrepareGeometry(WaveformRenderData* wdata)
traceBuffer.resize(count*2);
indexBuffer.resize(m_width);

#pragma omp parallel for
//#pragma omp parallel for
for(size_t j=0; j<realcount; j++)
{
int64_t off = digdat->m_offsets[j];
@@ -138,9 +138,9 @@ void WaveformArea::PrepareGeometry(WaveformRenderData* wdata)
indexBuffer.resize(m_width);

//TODO: can we push this to a compute shader?
//This doesn't look too SIMD-friendly because the inputs aren't all flops
if(fft)
{
#pragma omp parallel for
for(size_t j=0; j<count; j++)
{
traceBuffer[j*2] = andat->m_offsets[j] * xscale + xoff;
@@ -149,7 +149,6 @@ void WaveformArea::PrepareGeometry(WaveformRenderData* wdata)
}
else
{
#pragma omp parallel for
for(size_t j=0; j<count; j++)
{
traceBuffer[j*2] = andat->m_offsets[j] * xscale + xoff;