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.

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

flate: Simplify matchlen (remove asm) #1045

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Conversation

klauspost
Copy link
Owner

@klauspost klauspost commented Jan 21, 2025

With unsafe, there is no benefit from matchlen assembly. Remove it.

Summary by CodeRabbit

  • Performance Improvements

    • Enhanced match length calculation efficiency in compression algorithm
    • Streamlined match length computation process
    • Removed architecture-specific assembly implementations
  • Code Optimization

    • Simplified matching logic in encoding methods
    • Removed conditional complexity in match length determination
  • Architecture Changes

    • Removed specialized AMD64 implementation of match length function
    • Updated generic match length handling

With unsafe, there is no benefit from matchlen assembly. Remove it.
Copy link

coderabbitai bot commented Jan 21, 2025

📝 Walkthrough

Walkthrough

The pull request introduces modifications to the compression and matching logic in the flate package. The changes primarily focus on optimizing match length calculations by removing architecture-specific assembly implementations and updating the matching algorithms in Go code. The modifications include removing the matchlen_amd64.go and matchlen_amd64.s files, updating the fast_encoder.go and level1.go files to use a more streamlined approach for calculating match lengths, and removing build constraints in the matchlen_generic.go file.

Changes

File Change Summary
flate/fast_encoder.go - Added math/bits import
- Modified matchlen and matchlenLong methods to use 8-byte chunk comparisons
- Improved match length calculation efficiency
flate/level1.go - Simplified match length calculation in Encode method
- Removed conditional block for match length determination
- Directly used e.matchlenLong method
flate/matchlen_amd64.go - Completely removed architecture-specific matchLen function
flate/matchlen_amd64.s - Deleted assembly implementation of matchLen function
flate/matchlen_generic.go - Removed build constraints limiting file compilation

Sequence Diagram

sequenceDiagram
    participant Encoder as Fast Encoder
    participant MatchLen as Match Length Calculator
    
    Encoder->>MatchLen: Calculate match length
    MatchLen-->>MatchLen: Compare 8-byte chunks
    MatchLen-->>MatchLen: Compare remaining bytes
    MatchLen-->>Encoder: Return match length
Loading

Possibly related PRs

  • flate: Simplify L4-6 loading #1043: Simplifies offset calculations in Encode methods across multiple compression levels, indicating a broader effort to improve encoding efficiency
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (1)
flate/fast_encoder.go (1)

154-179: Optimize matchlen with 64-bit comparisons

The matchlen function has been efficiently rewritten to compare 8 bytes at a time using le.Load64 and detect differences with bits.TrailingZeros64. This improves performance by reducing the number of iterations required for matching sequences.

Consider adding comments to explain the use of bits.TrailingZeros64(diff) >> 3 for clarity, as this bit manipulation may not be immediately evident to all readers.

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between dbaa9c1 and 8b2e695.

📒 Files selected for processing (5)
  • flate/fast_encoder.go (3 hunks)
  • flate/level1.go (1 hunks)
  • flate/matchlen_amd64.go (0 hunks)
  • flate/matchlen_amd64.s (0 hunks)
  • flate/matchlen_generic.go (0 hunks)
💤 Files with no reviewable changes (3)
  • flate/matchlen_generic.go
  • flate/matchlen_amd64.s
  • flate/matchlen_amd64.go
⏰ Context from checks skipped due to timeout of 90000ms (16)
  • GitHub Check: fuzz-other ("noasm,nounsafe")
  • GitHub Check: fuzz-other (nounsafe)
  • GitHub Check: build (1.23.x, windows-latest)
  • GitHub Check: build (1.23.x, macos-latest)
  • GitHub Check: fuzz-zstd ("noasm,nounsafe")
  • GitHub Check: build (1.23.x, ubuntu-latest)
  • GitHub Check: fuzz-zstd (nounsafe)
  • GitHub Check: build (1.22.x, windows-latest)
  • GitHub Check: build (1.22.x, macos-latest)
  • GitHub Check: fuzz-s2 ("noasm,nounsafe")
  • GitHub Check: build (1.22.x, ubuntu-latest)
  • GitHub Check: fuzz-s2 (nounsafe)
  • GitHub Check: build (1.21.x, windows-latest)
  • GitHub Check: build (1.21.x, macos-latest)
  • GitHub Check: build (1.21.x, ubuntu-latest)
  • GitHub Check: build-special
🔇 Additional comments (4)
flate/fast_encoder.go (3)

10-10: Import math/bits for optimized bit operations

The addition of "math/bits" is appropriate for utilizing bit manipulation functions like bits.TrailingZeros64, which enhances performance in match length calculations.


162-164: Ensure safe unaligned memory access

When using le.Load64 for loading 8-byte chunks, ensure that unaligned memory access is safe on all target architectures. While x86 architectures handle unaligned access gracefully, others like ARM may raise exceptions.

Please confirm that le.Load64 safely handles unaligned memory access across all supported architectures.


201-222: Optimize matchlenLong with bulk comparisons

The matchlenLong function now efficiently handles long matches by processing 8 bytes at a time, similar to matchlen. This change enhances performance for larger data sets.

flate/level1.go (1)

122-122: Simplify match length calculation using matchlenLong

Replacing the custom inlined match extension logic with a call to e.matchlenLong streamlines the code and reduces duplication. This enhances maintainability and leverages the optimized function from fast_encoder.go.

@klauspost klauspost merged commit aafbabd into master Jan 21, 2025
22 checks passed
@klauspost klauspost deleted the flate-cleanup-matchlen branch January 21, 2025 11:32
klauspost added a commit that referenced this pull request Jan 26, 2025
klauspost added a commit that referenced this pull request Jan 27, 2025
* flate: Fix matchlen L5+L6

Regression from #1045
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant