mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-21 20:10:14 +01:00
1cdc4be14b
The position in the error array already indicate the SIMD in question, so take off all the formatted printing from the errors -- which in some cases were just not needed. We lose a little bit of extra context but it is all easily derivable from the message and the SIMD. This also will remove the overhead when SIMD selection is being used to just to find the selected dispatch width -- at a point where the shaders were already compiled -- and the errors are not used at all. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9849 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25336>
398 lines
13 KiB
C++
398 lines
13 KiB
C++
/*
|
|
* Copyright © 2021 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
|
|
#include "brw_private.h"
|
|
#include "compiler/shader_info.h"
|
|
#include "intel/dev/intel_debug.h"
|
|
#include "intel/dev/intel_device_info.h"
|
|
#include "util/ralloc.h"
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
enum {
|
|
SIMD8 = 0,
|
|
SIMD16 = 1,
|
|
SIMD32 = 2,
|
|
};
|
|
|
|
const bool spilled = true;
|
|
const bool not_spilled = false;
|
|
|
|
class SIMDSelectionTest : public ::testing::Test {
|
|
protected:
|
|
SIMDSelectionTest()
|
|
: mem_ctx(ralloc_context(NULL))
|
|
, devinfo(rzalloc(mem_ctx, intel_device_info))
|
|
, prog_data(rzalloc(mem_ctx, struct brw_cs_prog_data))
|
|
, simd_state{
|
|
.devinfo = devinfo,
|
|
.prog_data = prog_data,
|
|
}
|
|
{
|
|
brw_process_intel_debug_variable();
|
|
}
|
|
|
|
~SIMDSelectionTest() {
|
|
ralloc_free(mem_ctx);
|
|
};
|
|
|
|
void *mem_ctx;
|
|
intel_device_info *devinfo;
|
|
struct brw_cs_prog_data *prog_data;
|
|
brw_simd_selection_state simd_state;
|
|
};
|
|
|
|
class SIMDSelectionCS : public SIMDSelectionTest {
|
|
protected:
|
|
SIMDSelectionCS() {
|
|
prog_data->base.stage = MESA_SHADER_COMPUTE;
|
|
prog_data->local_size[0] = 32;
|
|
prog_data->local_size[1] = 1;
|
|
prog_data->local_size[2] = 1;
|
|
|
|
devinfo->max_cs_workgroup_threads = 64;
|
|
}
|
|
};
|
|
|
|
TEST_F(SIMDSelectionCS, DefaultsToSIMD16)
|
|
{
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, not_spilled);
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD16);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, TooBigFor16)
|
|
{
|
|
prog_data->local_size[0] = devinfo->max_cs_workgroup_threads;
|
|
prog_data->local_size[1] = 32;
|
|
prog_data->local_size[2] = 1;
|
|
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, spilled);
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD32);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, WorkgroupSize1)
|
|
{
|
|
prog_data->local_size[0] = 1;
|
|
prog_data->local_size[1] = 1;
|
|
prog_data->local_size[2] = 1;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD8);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, WorkgroupSize8)
|
|
{
|
|
prog_data->local_size[0] = 8;
|
|
prog_data->local_size[1] = 1;
|
|
prog_data->local_size[2] = 1;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD8);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, WorkgroupSizeVariable)
|
|
{
|
|
prog_data->local_size[0] = 0;
|
|
prog_data->local_size[1] = 0;
|
|
prog_data->local_size[2] = 0;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, not_spilled);
|
|
|
|
ASSERT_EQ(prog_data->prog_mask, 1u << SIMD8 | 1u << SIMD16 | 1u << SIMD32);
|
|
|
|
const unsigned wg_8_1_1[] = { 8, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_8_1_1), SIMD8);
|
|
|
|
const unsigned wg_16_1_1[] = { 16, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_16_1_1), SIMD16);
|
|
|
|
const unsigned wg_32_1_1[] = { 32, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_32_1_1), SIMD16);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, WorkgroupSizeVariableSpilled)
|
|
{
|
|
prog_data->local_size[0] = 0;
|
|
prog_data->local_size[1] = 0;
|
|
prog_data->local_size[2] = 0;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, spilled);
|
|
|
|
ASSERT_EQ(prog_data->prog_mask, 1u << SIMD8 | 1u << SIMD16 | 1u << SIMD32);
|
|
|
|
const unsigned wg_8_1_1[] = { 8, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_8_1_1), SIMD8);
|
|
|
|
const unsigned wg_16_1_1[] = { 16, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_16_1_1), SIMD8);
|
|
|
|
const unsigned wg_32_1_1[] = { 32, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_32_1_1), SIMD8);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, WorkgroupSizeVariableNoSIMD8)
|
|
{
|
|
prog_data->local_size[0] = 0;
|
|
prog_data->local_size[1] = 0;
|
|
prog_data->local_size[2] = 0;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, not_spilled);
|
|
|
|
ASSERT_EQ(prog_data->prog_mask, 1u << SIMD16 | 1u << SIMD32);
|
|
|
|
const unsigned wg_8_1_1[] = { 8, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_8_1_1), SIMD16);
|
|
|
|
const unsigned wg_16_1_1[] = { 16, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_16_1_1), SIMD16);
|
|
|
|
const unsigned wg_32_1_1[] = { 32, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_32_1_1), SIMD16);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, WorkgroupSizeVariableNoSIMD16)
|
|
{
|
|
prog_data->local_size[0] = 0;
|
|
prog_data->local_size[1] = 0;
|
|
prog_data->local_size[2] = 0;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, not_spilled);
|
|
|
|
ASSERT_EQ(prog_data->prog_mask, 1u << SIMD8 | 1u << SIMD32);
|
|
|
|
const unsigned wg_8_1_1[] = { 8, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_8_1_1), SIMD8);
|
|
|
|
const unsigned wg_16_1_1[] = { 16, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_16_1_1), SIMD8);
|
|
|
|
const unsigned wg_32_1_1[] = { 32, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_32_1_1), SIMD8);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, WorkgroupSizeVariableNoSIMD8NoSIMD16)
|
|
{
|
|
prog_data->local_size[0] = 0;
|
|
prog_data->local_size[1] = 0;
|
|
prog_data->local_size[2] = 0;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, not_spilled);
|
|
|
|
ASSERT_EQ(prog_data->prog_mask, 1u << SIMD32);
|
|
|
|
const unsigned wg_8_1_1[] = { 8, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_8_1_1), SIMD32);
|
|
|
|
const unsigned wg_16_1_1[] = { 16, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_16_1_1), SIMD32);
|
|
|
|
const unsigned wg_32_1_1[] = { 32, 1, 1 };
|
|
ASSERT_EQ(brw_simd_select_for_workgroup_size(devinfo, prog_data, wg_32_1_1), SIMD32);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, SpillAtSIMD8)
|
|
{
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, spilled);
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD8);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, SpillAtSIMD16)
|
|
{
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, spilled);
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD8);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, EnvironmentVariable32)
|
|
{
|
|
intel_debug |= DEBUG_DO32;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, not_spilled);
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD32);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, EnvironmentVariable32ButSpills)
|
|
{
|
|
intel_debug |= DEBUG_DO32;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, not_spilled);
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, spilled);
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD16);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, Require8)
|
|
{
|
|
simd_state.required_width = 8;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD8);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, Require8ErrorWhenNotCompile)
|
|
{
|
|
simd_state.required_width = 8;
|
|
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), -1);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, Require16)
|
|
{
|
|
simd_state.required_width = 16;
|
|
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, not_spilled);
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD16);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, Require16ErrorWhenNotCompile)
|
|
{
|
|
simd_state.required_width = 16;
|
|
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), -1);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, Require32)
|
|
{
|
|
simd_state.required_width = 32;
|
|
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, not_spilled);
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), SIMD32);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, Require32ErrorWhenNotCompile)
|
|
{
|
|
simd_state.required_width = 32;
|
|
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_FALSE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
|
|
ASSERT_EQ(brw_simd_select(simd_state), -1);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, FirstCompiledIsSIMD8)
|
|
{
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
brw_simd_mark_compiled(simd_state, SIMD8, not_spilled);
|
|
|
|
ASSERT_TRUE(brw_simd_any_compiled(simd_state));
|
|
ASSERT_EQ(brw_simd_first_compiled(simd_state), SIMD8);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, FirstCompiledIsSIMD16)
|
|
{
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
brw_simd_mark_compiled(simd_state, SIMD16, not_spilled);
|
|
|
|
ASSERT_TRUE(brw_simd_any_compiled(simd_state));
|
|
ASSERT_EQ(brw_simd_first_compiled(simd_state), SIMD16);
|
|
}
|
|
|
|
TEST_F(SIMDSelectionCS, FirstCompiledIsSIMD32)
|
|
{
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD8));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD16));
|
|
ASSERT_TRUE(brw_simd_should_compile(simd_state, SIMD32));
|
|
brw_simd_mark_compiled(simd_state, SIMD32, not_spilled);
|
|
|
|
ASSERT_TRUE(brw_simd_any_compiled(simd_state));
|
|
ASSERT_EQ(brw_simd_first_compiled(simd_state), SIMD32);
|
|
}
|