Skip to content

RFC: remove OPENMP_SIMD codepath config#13875

Merged
TurboGit merged 1 commit into
darktable-org:masterfrom
ralfbrown:openmp_simd
Mar 10, 2023
Merged

RFC: remove OPENMP_SIMD codepath config#13875
TurboGit merged 1 commit into
darktable-org:masterfrom
ralfbrown:openmp_simd

Conversation

@ralfbrown

@ralfbrown ralfbrown commented Mar 9, 2023

Copy link
Copy Markdown
Collaborator

As we near the end of the SSE removal, we can also remove the remnants of a special code path for OpenMP autovectorization (since there are in fact no cases where we have both autovectorized and unvectorized code paths).

@ralfbrown ralfbrown added the scope: codebase making darktable source code easier to manage label Mar 9, 2023
@TurboGit TurboGit added this to the 4.4 milestone Mar 10, 2023

@TurboGit TurboGit left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@TurboGit TurboGit merged commit 5863cef into darktable-org:master Mar 10, 2023
@ralfbrown ralfbrown deleted the openmp_simd branch March 10, 2023 08:10
@MStraeten

Copy link
Copy Markdown
Collaborator

breaks macos m1 build since sse isn't available there:

[ 40%] Building C object bin/CMakeFiles/lib_darktable.dir/common/locallaplacian.c.o
/Users/martinstraeten/src/darktable/src/common/interpolation.c:559:3: fatal error: expected expression
  else
  ^
1 error generated.
make[2]: *** [bin/CMakeFiles/lib_darktable.dir/common/interpolation.c.o] Error 1
static inline void compute_upsampling_kernel(const struct dt_interpolation *itor,
                                             float *kernel,
                                             float *norm,
                                             int *first,
                                             float t)
{
#if defined(__SSE2__)
  if(darktable.codepath.SSE2)
    return compute_upsampling_kernel_sse(itor, kernel, norm, first, t);
#endif
  else
    return compute_upsampling_kernel_plain(itor, kernel, norm, first, t);
}

also in line 703, 1038
it seems the #endif needs to be after "else"

ralfbrown added a commit to ralfbrown/darktable that referenced this pull request Mar 11, 2023
@ralfbrown

Copy link
Copy Markdown
Collaborator Author

You're right, and I had it that way other places....

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

scope: codebase making darktable source code easier to manage

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants