9110f641df
It can be the case that a collect and one of its sources are assigned to non-overlapping parts of the same merge set, for example: ssa_1 = ... ssa_2 = ... ssa_3 = ... ssa_4 = collect ssa_1, ssa_2 (kill), ssa_3 ... = ssa_4 (kill) ssa_5 = collect ssa_1, ssa_3 ... = ssa_1 (kill) ... = ssa_3 (kill) ... = ssa_5 (kill) If we merge the first collect first, we get a merge set: ssa_1 (offset 0) ssa_2 (offset 2) ssa_3 (offset 4) ssa_4 (offset 0) Now, we decide to merge ssa_1 and ssa_5: ssa_1 (offset 0) ssa_2 (offset 2) ssa_3 (offset 4) ssa_4 (offset 0) ssa_5 (offset 0) ssa_3 cannot become a child of ssa_5 in the interval tree, just like a source not in the same merge set, so we should not remove it and then reinsert it assuming that RA will make it a child of ssa_5. This fixes an RA validation error in Farming Simulater. Fixes:0ffcb19("ir3: Rewrite register allocation") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27497> (cherry picked from commitaeed5fd98d)
`Mesa <https://mesa3d.org>`_ - The 3D Graphics Library ====================================================== Source ------ This repository lives at https://gitlab.freedesktop.org/mesa/mesa. Other repositories are likely forks, and code found there is not supported. Build & install --------------- You can find more information in our documentation (`docs/install.rst <https://mesa3d.org/install.html>`_), but the recommended way is to use Meson (`docs/meson.rst <https://mesa3d.org/meson.html>`_): .. code-block:: sh $ mkdir build $ cd build $ meson .. $ sudo ninja install Support ------- Many Mesa devs hang on IRC; if you're not sure which channel is appropriate, you should ask your question on `OFTC's #dri-devel <irc://irc.oftc.net/dri-devel>`_, someone will redirect you if necessary. Remember that not everyone is in the same timezone as you, so it might take a while before someone qualified sees your question. To figure out who you're talking to, or which nick to ping for your question, check out `Who's Who on IRC <https://dri.freedesktop.org/wiki/WhosWho/>`_. The next best option is to ask your question in an email to the mailing lists: `mesa-dev\@lists.freedesktop.org <https://lists.freedesktop.org/mailman/listinfo/mesa-dev>`_ Bug reports ----------- If you think something isn't working properly, please file a bug report (`docs/bugs.rst <https://mesa3d.org/bugs.html>`_). Contributing ------------ Contributions are welcome, and step-by-step instructions can be found in our documentation (`docs/submittingpatches.rst <https://mesa3d.org/submittingpatches.html>`_). Note that Mesa uses gitlab for patches submission, review and discussions.