Skip to content

Commit

Permalink
Merge branch 'disable-forceinline-win' into 'develop_stream'
Browse files Browse the repository at this point in the history
Disable force-inlining on windows

Closes #700

See merge request amd/libraries/rocPRIM!649
  • Loading branch information
Gergely Mészáros authored and Naraenda committed Jul 18, 2024
2 parents 58c96d9 + faf8bdf commit c5a9d07
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,7 @@ build:windows:
- .deps:visual-studio-devshell
parallel:
matrix:
# Debug is disabled due to extensive link times, tracked in issue 679.
- BUILD_TYPE: [Release]
- BUILD_TYPE: [Debug, Release]
BUILD_TARGET: [BENCHMARK, TEST]
script:
- mkdir -p $CI_PROJECT_DIR/build
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@ Documentation for rocPRIM is available at

### Changes

### Changes

* Modified the input size in device adjacent difference benchmarks. Observed performance with these benchmarks might be different.

### Fixes

* Fixed an issue where while running rtest.py on windows and passing in an absolute path to --install_dir
causes FileNotFound error
* rocPRIM functions are no longer forcefully inlined on Windows, significantly reducing the build
time in debug builds.

## Unreleased rocPRIM-3.2.0 for ROCm 6.2.0

Expand Down
9 changes: 1 addition & 8 deletions rocprim/include/rocprim/config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,7 @@
#endif

#ifndef DOXYGEN_DOCUMENTATION_BUILD
// Currently HIP on Windows has a bug involving inline device functions generating
// local memory/register allocation errors during compilation. Current workaround is to
// use __attribute__((always_inline)) for the affected functions
#ifdef _WIN32
#define ROCPRIM_INLINE inline __attribute__((always_inline))
#else
#define ROCPRIM_INLINE inline
#endif
#define ROCPRIM_INLINE inline
#else
// Prefer simpler signatures to let Sphinx/Breathe parse them
#define ROCPRIM_FORCE_INLINE inline
Expand Down

0 comments on commit c5a9d07

Please sign in to comment.