fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

brw: Move MATH related validation
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Moved existing checks to EU validation and added a few more
based on instruction description in the various PRMs / BSpec.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38877>
This commit is contained in:
Caio Oliveira 2025-12-04 14:30:34 -08:00 • committed by Marge Bot
parent 55863c1267
commit e53576a559
2 changed files with 62 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/intel/compiler/brw/brw_eu_emit.c
View file

@ -1298,31 +1298,8 @@ void gfx6_math(struct brw_codegen *p,
const struct intel_device_info *devinfo = p->devinfo;
brw_eu_inst *insn = next_insn(p, BRW_OPCODE_MATH);
assert(dest.file == FIXED_GRF);
assert(dest.hstride == BRW_HORIZONTAL_STRIDE_1);
if (function == BRW_MATH_FUNCTION_INT_DIV_QUOTIENT ||
function == BRW_MATH_FUNCTION_INT_DIV_REMAINDER ||
function == BRW_MATH_FUNCTION_INT_DIV_QUOTIENT_AND_REMAINDER) {
assert(src0.type != BRW_TYPE_F);
assert(src1.type != BRW_TYPE_F);
assert(src1.file == FIXED_GRF ||
src1.file == IMM);
/* From BSpec 6647/47428 "[Instruction] Extended Math Function":
* INT DIV function does not support source modifiers.
*/
assert(!src0.negate);
assert(!src0.abs);
assert(!src1.negate);
assert(!src1.abs);
} else {
assert(src0.type == BRW_TYPE_F ||
(src0.type == BRW_TYPE_HF && devinfo->ver >= 9));
assert(src1.type == BRW_TYPE_F ||
(src1.type == BRW_TYPE_HF && devinfo->ver >= 9));
}
/* This workaround says that we cannot use scalar broadcast with HF types.
* However, for is_scalar values, all 16 elements contain the same value, so
* we can replace a <0,1,0> region with <16,16,1> without ill effect.

63
src/intel/compiler/brw/brw_eu_validate.c
View file

@ -1919,6 +1919,9 @@ instruction_restrictions(const struct brw_isa_info *isa,
case BRW_MATH_FUNCTION_INT_DIV_QUOTIENT_AND_REMAINDER:
case BRW_MATH_FUNCTION_INT_DIV_QUOTIENT:
case BRW_MATH_FUNCTION_INT_DIV_REMAINDER: {
ERROR_IF(devinfo->verx10 >= 125,
"INT DIV functions not supported in Gfx125+.");
/* Page 442 of the Broadwell PRM Volume 2a "Extended Math Function" says:
* INT DIV function does not support source modifiers.
* Bspec 6647 extends it back to Ivy Bridge.
@ -1927,11 +1930,69 @@ instruction_restrictions(const struct brw_isa_info *isa,
bool src1_valid = !inst->src[1].negate && !inst->src[1].abs;
ERROR_IF(!src0_valid || !src1_valid,
"INT DIV function does not support source modifiers.");
ERROR_IF(inst->src[0].type != BRW_TYPE_D &&
inst->src[0].type != BRW_TYPE_UD,
"INT DIV function need D or UD source type.");
ERROR_IF(inst->src[0].type != inst->src[0].type ||
inst->src[0].type != inst->dst.type,
"INT DIV function need all operand types to match.");
break;
}
default:
default: {
ERROR_IF(devinfo->verx10 >= 125 &&
(math_function == BRW_MATH_FUNCTION_POW ||
math_function == BRW_MATH_FUNCTION_FDIV),
"POW/FDIV not supported in Gfx125+.");
const bool ieee_macro =
math_function == GFX8_MATH_FUNCTION_INVM ||
math_function == GFX8_MATH_FUNCTION_RSQRTM;
if (ieee_macro && devinfo->ver >= 125) {
ERROR_IF(inst->src[0].type != BRW_TYPE_F &&
inst->src[0].type != BRW_TYPE_HF &&
inst->src[0].type != BRW_TYPE_DF,
"MATH IEEE macros source type must be F, HF or DF (for Gfx125+).");
} else {
ERROR_IF(inst->src[0].type != BRW_TYPE_F &&
inst->src[0].type != BRW_TYPE_HF,
"MATH source type must be F or HF.");
}
const bool two_srcs =
math_function == GFX8_MATH_FUNCTION_INVM ||
math_function == BRW_MATH_FUNCTION_POW ||
math_function == BRW_MATH_FUNCTION_FDIV;
if (devinfo->ver >= 125) {
ERROR_IF(inst->src[0].type != inst->dst.type,
"Math function source and destination types must match on Gfx125+.");
ERROR_IF(two_srcs &&
inst->src[0].type != inst->src[1].type,
"Math function need both source types to match on Gfx125+.");
} else {
ERROR_IF(inst->dst.type != BRW_TYPE_F &&
inst->dst.type != BRW_TYPE_HF,
"Math function destination must be F or HF before Gfx125.");
ERROR_IF(two_srcs &&
inst->src[1].type != BRW_TYPE_F &&
inst->src[1].type != BRW_TYPE_HF,
"Math function source 1 type must be F or HF before Gfx125.");
}
ERROR_IF(inst->dst.file != FIXED_GRF,
"The math instruction must use GRF as destination.");
ERROR_IF((devinfo->ver >= 20 || !ieee_macro) &&
(src0_is_acc(inst) || (two_srcs && src1_is_acc(inst))),
"Accumulator register access is only supported for Gfx125 and earlier, "
"and only for IEEE macro functions (INVM/RSQRTM).");
break;
}
}
}
if (inst->opcode == BRW_OPCODE_DP4A) {