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

8264318 Lanai: DrawHugeImageTest.java fails on apple M1 #3369

Closed
wants to merge 1 commit into from

Conversation

@dekonoplyov
Copy link

@dekonoplyov dekonoplyov commented Apr 7, 2021

Check if blit sizes are less than MTL_GPU_FAMILY_MAC_TXT_SIZE.

It's safe since we copy tile from the image with memcpy.

// copy src pixels inside src bounds to buff
for (int row = 0; row < sh; row++) {
    memcpy(buff.contents + (row * sw * srcInfo->pixelStride), raster, sw * srcInfo->pixelStride);
    raster += (NSUInteger)srcInfo->scanStride;
}

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8264318: Lanai: DrawHugeImageTest.java fails on apple M1

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3369/head:pull/3369
$ git checkout pull/3369

Update a local copy of the PR:
$ git checkout pull/3369
$ git pull https://git.openjdk.java.net/jdk pull/3369/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3369

View PR using the GUI difftool:
$ git pr show -t 3369

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3369.diff

Check if blit sizes are less than MTL_GPU_FAMILY_MAC_TXT_SIZE
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 7, 2021

👋 Welcome back dkonoplev! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Apr 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 7, 2021

@dekonoplyov The following label will be automatically applied to this pull request:

  • 2d

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the 2d label Apr 7, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 7, 2021

Webrevs

@mrserb
Copy link
Member

@mrserb mrserb commented Apr 7, 2021

I wonder why we have two similar but different constants:
#define MaxTextureSize 16384
#define MTL_GPU_FAMILY_MAC_TXT_SIZE 16384

@dekonoplyov
Copy link
Author

@dekonoplyov dekonoplyov commented Apr 8, 2021

I wonder why we have two similar but different constants:
#define MaxTextureSize 16384
#define MTL_GPU_FAMILY_MAC_TXT_SIZE 16384

I can remove MaxTextureSize and replace its usages.
Should I file a new bug or put changes in this PR?

@mrserb
Copy link
Member

@mrserb mrserb commented Apr 10, 2021

I can remove MaxTextureSize and replace its usages.
Should I file a new bug or put changes in this PR?

Yes please file a bug.

@dekonoplyov
Copy link
Author

@dekonoplyov dekonoplyov commented Apr 12, 2021

@dekonoplyov
Copy link
Author

@dekonoplyov dekonoplyov commented Apr 12, 2021

@mrserb maybe you know someone who can review my PR: 3368

mrserb
mrserb approved these changes Apr 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 14, 2021

@dekonoplyov This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8264318: Lanai: DrawHugeImageTest.java fails on apple M1

Reviewed-by: serb, jdv

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 120 new commits pushed to the master branch:

  • 75da1e9: 8264423: G1: Rename full gc attribute table states
  • 125a847: 8264788: Make SequentialSubTasksDone use-once
  • 0793fcb: 8260255: C1: LoopInvariantCodeMotion constructor can leave some fields uninitialized
  • b224b56: 8265225: jdk/jfr/tool/TestConfigure.java fails to cleanup the output files after the testing
  • 7c6e379: 8265120: hs_err improvement: align the output of Virtual space metadata
  • e7cbeba: 8259070: Add jcmd option to dump CDS
  • 5931948: 8265246: Fix macos-Aarch64 build after JDK-8263709
  • 79bff21: 8263709: Cleanup THREAD/TRAPS/CHECK usage in JRT_ENTRY routines
  • f4c3efd: 8265192: [macos_aarch64] configure script fails if GNU uname in PATH
  • e167577: 8265078: jpackage tests on Windows leave large temp files
  • ... and 110 more: https://git.openjdk.java.net/jdk/compare/c3abdc9aadc734053dbcc43d5294d5f16a0b0ce3...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@mrserb, @jayathirthrao) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Apr 14, 2021
@dekonoplyov
Copy link
Author

@dekonoplyov dekonoplyov commented Apr 14, 2021

/integrate

@openjdk openjdk bot added the sponsor label Apr 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 14, 2021

@dekonoplyov
Your change (at version bcb3a27) is now ready to be sponsored by a Committer.

@jayathirthrao
Copy link
Member

@jayathirthrao jayathirthrao commented Apr 15, 2021

I will sponsor this PR, waiting for complete test run to finish.

@jayathirthrao
Copy link
Member

@jayathirthrao jayathirthrao commented Apr 15, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Apr 15, 2021

@jayathirthrao @dekonoplyov Since your change was applied there have been 127 commits pushed to the master branch:

  • 81877f7: 8262501: jdk17 libjvm link failure with --as-needed and clock_gettime in librt
  • b23dbdb: 8257804: Test runtime/modules/ModuleStress/ModuleStressGC.java fails: 'package test defined in module jdk.test, exports list being walked' missing from stdout/stderr
  • 9d669c9: 8262981: Create implementation for NSAccessibilitySlider protocol
  • abdff79: 8163086: java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java fails
  • b72d99e: 8233564: [TESTBUG] MouseComboBoxTest.java is failing
  • 2b5869a: 8233565: [TESTBUG] NullModalityDialogTest.java fails on MacOS
  • bba16f6: 8264818: G1: Improve liveness check for empty pinned regions after full gc marking
  • 75da1e9: 8264423: G1: Rename full gc attribute table states
  • 125a847: 8264788: Make SequentialSubTasksDone use-once
  • 0793fcb: 8260255: C1: LoopInvariantCodeMotion constructor can leave some fields uninitialized
  • ... and 117 more: https://git.openjdk.java.net/jdk/compare/c3abdc9aadc734053dbcc43d5294d5f16a0b0ce3...master

Your commit was automatically rebased without conflicts.

Pushed as commit 0fee6ec.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

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