Fix incorrect declaration of FORCE_SSE2 #1880

phprus · 2025-02-25T06:45:00Z

Fix for #1879

@WildCard65, test this PR, please.

Summary by CodeRabbit

Refactor
- Revised the configuration process for advanced CPU instruction support so that this feature is activated only when explicitly enabled, streamlining the build settings.

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>

coderabbitai · 2025-02-25T06:45:08Z

Walkthrough

The changes restructure the logic for setting the FORCE_SSE2 option in the build configuration. The conditional block that checked for BASEARCH_X86_FOUND and matched specific x86 patterns—allowing FORCE_SSE2 to be defined when SSE2 intrinsics were available—was removed. The same functionality is now repositioned to occur only if the WITH_SSE2 option is enabled, thereby tying the FORCE_SSE2 setting to an explicit user choice.

Changes

File	Summary
CMakeLists.txt	Removed the conditional checking for `BASEARCH_X86_FOUND` for x86 architectures and forcing SSE2 capability. Reintroduced the FORCE_SSE2 logic under the `if(WITH_SSE2)` condition.

Sequence Diagram(s)

sequenceDiagram
    participant U as User
    participant C as CMake

    U->>C: Initiate build configuration
    C->>C: Check if WITH_SSE2 option is enabled
    alt WITH_SSE2 enabled
        C->>C: Check for SSE2 intrinsics availability (and architecture conditions)
        alt SSE2 available
            C->>C: Define FORCE_SSE2 option
        else SSE2 unavailable
            C->>C: Skip FORCE_SSE2 definition
        end
    else
        C->>C: Do not consider FORCE_SSE2
    end

Suggested labels

Build Env

Suggested reviewers

Dead2

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9d4af45 and 68e20b1.

📒 Files selected for processing (1)

CMakeLists.txt (1 hunks)

🔇 Additional comments (1)

CMakeLists.txt (1)

912-915: Refined FORCE_SSE2 Option Scope:
The refactored block now ensures that the FORCE_SSE2 option is only presented when the WITH_SSE2 option is enabled and additionally limits its applicability to architectures matching "i[3-6]86". This change meets the PR objective by coupling FORCE_SSE2 explicitly to SSE2 support via the WITH_SSE2 flag, thereby eliminating its unconditional availability based solely on intrinsics.

Suggestion: Verify that the regular expression "i[3-6]86" accurately encompasses all intended legacy x86 targets. If additional architectures should be covered (or if some edge cases are excluded), consider refining the regex or adding supplementary conditions.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

codecov · 2025-02-25T07:27:33Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.36%. Comparing base (9d4af45) to head (68e20b1).
Report is 3 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1880      +/-   ##
===========================================
- Coverage    82.37%   82.36%   -0.01%     
===========================================
  Files          141      141              
  Lines        12556    12556              
  Branches      2894     2894              
===========================================
- Hits         10343    10342       -1     
+ Misses        1237     1236       -1     
- Partials       976      978       +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

WildCard65

This will work, as I made this change in my own local copy of zlib-ng.

Dead2

LGTM

Fix incorrect declaration of FORCE_SSE2

68e20b1

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>

WildCard65 approved these changes Feb 25, 2025

View reviewed changes

nmoinvaz added the Build Env label Feb 25, 2025

nmoinvaz approved these changes Feb 25, 2025

View reviewed changes

Dead2 approved these changes Feb 28, 2025

View reviewed changes

Dead2 merged commit 356a797 into zlib-ng:develop Mar 1, 2025
151 checks passed

coderabbitai bot mentioned this pull request Mar 23, 2025

port: Use __cpuid only, when available. #1887

Merged

Dead2 mentioned this pull request Aug 3, 2025

Backport stable release (2.2.5) #1943

Merged

nmoinvaz mentioned this pull request Sep 26, 2025

Incorrect usage of cmake_dependent_option for FORCE_SSE2 #1879

Closed

coderabbitai bot mentioned this pull request Oct 10, 2025

Remove force-sse2 config option from x86 builds. #1982

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Fix incorrect declaration of FORCE_SSE2 #1880

Fix incorrect declaration of FORCE_SSE2 #1880

Uh oh!

phprus commented Feb 25, 2025 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Feb 25, 2025 •

edited

Loading

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

codecov bot commented Feb 25, 2025 •

edited

Loading

Uh oh!

WildCard65 left a comment

Uh oh!

Dead2 left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Fix incorrect declaration of FORCE_SSE2 #1880

Fix incorrect declaration of FORCE_SSE2 #1880

Uh oh!

Conversation

phprus commented Feb 25, 2025 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Feb 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Suggested labels

Suggested reviewers

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

codecov bot commented Feb 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

WildCard65 left a comment

Choose a reason for hiding this comment

Uh oh!

Dead2 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

phprus commented Feb 25, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Feb 25, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

codecov bot commented Feb 25, 2025 •

edited

Loading