Page MenuHome
Differential D6082

Cycles: Fix T70685
ClosedPublic
Actions

Authored by Ray Molenkamp (LazyDodo) on Oct 16 2019, 6:24 PM.

Details

Reviewers
Dalai Felinto (dfelinto)
Brecht Van Lommel (brecht)
Commits
rC6624140709d2: Fix T70685: Cycles crash using WITH_CYCLES_NATIVE_ONLY on Windows
rB9339dc6dd108: Fix T70685: Cycles crash using WITH_CYCLES_NATIVE_ONLY on Windows
Summary

Building with WITH_CYCLES_NATIVE_ONLY on AVX2+MSVC system leads to a bad combination of sse2 kernel+BVH8.

What is happening is:

  1. MSVC does not have an -march=native switch, so kernel.cpp gets build with the default flags and you and up with a run of the mill SSE2 kernel.
  1. DebugFlags().cpu.has_avx2() is true, and it decides BVH8 is a valid option, normally not an issue, since kernel.cpp detects the AVX2 as well and has the right kernel.
  1. But not for msvc which tries to match up and sse2 kernel with BVH8 and thing go boom

Diff Detail

Repository
rB Blender
Branch
tmp_T70685 (branched from master)
Build Status
Buildable 5392
Build 5392: arc lint + arc unit

Event Timeline

Ray Molenkamp (LazyDodo) created this revision.Oct 16 2019, 6:24 PM
Harbormaster completed remote builds in B5391: Diff 19070.Oct 16 2019, 6:25 PM
Ray Molenkamp (LazyDodo) added a reviewer: Cycles.Oct 16 2019, 6:25 PM
Dalai Felinto (dfelinto) accepted this revision as: Dalai Felinto (dfelinto).Oct 16 2019, 6:32 PM

Patch works fine here (MSVC + AVX2).

intern/cycles/device/device_cpu.cpp
341–344

typo: switch, not swtich

343

Drop the extra empty spaces.

This revision is now accepted and ready to land.Oct 16 2019, 6:32 PM
Dalai Felinto (dfelinto) added a subscriber: Sergey Sharybin (sergey).Oct 16 2019, 6:33 PM

(and for the records my computer was the one where this originally happened, without this patch almost all cycles unittest fail with native kernel)

Ray Molenkamp (LazyDodo) updated this revision to Diff 19071.Oct 16 2019, 6:33 PM
  • fix typos and whitespace
Harbormaster completed remote builds in B5392: Diff 19071.Oct 16 2019, 6:33 PM
Ray Molenkamp (LazyDodo) marked 2 inline comments as done.Oct 16 2019, 6:34 PM
Ray Molenkamp (LazyDodo) edited reviewers, added: Brecht Van Lommel (brecht); removed: Cycles.Feb 8 2020, 7:43 PM

@Brecht Van Lommel (brecht) want to give this one last look over before i land it?

Brecht Van Lommel (brecht) accepted this revision.Feb 10 2020, 8:47 AM
Closed by commit rB9339dc6dd108: Fix T70685: Cycles crash using WITH_CYCLES_NATIVE_ONLY on Windows (authored by Ray Molenkamp (LazyDodo), committed by Brecht Van Lommel (brecht)). · Explain WhyFeb 14 2020, 2:12 PM
This revision was automatically updated to reflect the committed changes.
Brecht Van Lommel (brecht) added a commit: rB9339dc6dd108: Fix T70685: Cycles crash using WITH_CYCLES_NATIVE_ONLY on Windows.
Brecht Van Lommel (brecht) added a commit: rC6624140709d2: Fix T70685: Cycles crash using WITH_CYCLES_NATIVE_ONLY on Windows.Jun 2 2020, 7:35 AM

Revision Contents
Changeset List

PathSize
intern/
cycles/
device/
5 lines

Diff 19071

View Options

intern/cycles/device/device_cpu.cpp

Loading...