* [PATCH mesa v2 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers
@ 2016-03-17 16:07 Hans de Goede
[not found] ` <1458230823-25213-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 9+ messages in thread
From: Hans de Goede @ 2016-03-17 16:07 UTC (permalink / raw)
To: Ilia Mirkin, Samuel Pitoiset
Cc: mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Some of the lowering steps we currently do for FILE_MEMORY_GLOBAL only
apply to buffers, making it impossible to use FILE_MEMORY_GLOBAL for
OpenCL global buffers.
This commits changes the buffer code to use FILE_MEMORY_BUFFER at the
ir_from_tgsi and lowering steps, freeing use of FILE_MEMORY_GLOBAL
for use with OpenCL global buffers.
Note that after lowering buffer accesses use the FILE_MEMORY_GLOBAL
register file.
Tested with piglet on a gk107, before this patch:
./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader
[9/9] pass: 9 /
after:
./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader
[9/9] pass: 9 /
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
-New patch in v2 of patch-set to re-enable support for global opencl buffers
---
src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 +
src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +-
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 8 +++++---
src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 1 +
src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 5 ++++-
src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | 1 +
6 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
index 7b0eb2f..5141fc6 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
@@ -332,6 +332,7 @@ enum DataFile
FILE_MEMORY_CONST,
FILE_SHADER_INPUT,
FILE_SHADER_OUTPUT,
+ FILE_MEMORY_BUFFER,
FILE_MEMORY_GLOBAL,
FILE_MEMORY_SHARED,
FILE_MEMORY_LOCAL,
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
index baa2e30..7ae0cb2 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
@@ -373,7 +373,7 @@ static nv50_ir::DataFile translateFile(uint file)
case TGSI_FILE_PREDICATE: return nv50_ir::FILE_PREDICATE;
case TGSI_FILE_IMMEDIATE: return nv50_ir::FILE_IMMEDIATE;
case TGSI_FILE_SYSTEM_VALUE: return nv50_ir::FILE_SYSTEM_VALUE;
- case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_GLOBAL;
+ case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_BUFFER;
case TGSI_FILE_MEMORY: return nv50_ir::FILE_MEMORY_GLOBAL;
case TGSI_FILE_SAMPLER:
case TGSI_FILE_NULL:
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
index d0936d8..628deb7 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
@@ -1141,13 +1141,14 @@ NVC0LoweringPass::handleATOM(Instruction *atom)
handleSharedATOM(atom);
return true;
default:
- assert(atom->src(0).getFile() == FILE_MEMORY_GLOBAL);
+ assert(atom->src(0).getFile() == FILE_MEMORY_BUFFER);
base = loadResInfo64(ind, atom->getSrc(0)->reg.fileIndex * 16);
assert(base->reg.size == 8);
if (ptr)
base = bld.mkOp2v(OP_ADD, TYPE_U64, base, base, ptr);
assert(base->reg.size == 8);
atom->setIndirect(0, 0, base);
+ atom->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL;
return true;
}
base =
@@ -1963,7 +1964,7 @@ NVC0LoweringPass::visit(Instruction *i)
} else if (i->src(0).getFile() == FILE_SHADER_OUTPUT) {
assert(prog->getType() == Program::TYPE_TESSELLATION_CONTROL);
i->op = OP_VFETCH;
- } else if (i->src(0).getFile() == FILE_MEMORY_GLOBAL) {
+ } else if (i->src(0).getFile() == FILE_MEMORY_BUFFER) {
Value *ind = i->getIndirect(0, 1);
Value *ptr = loadResInfo64(ind, i->getSrc(0)->reg.fileIndex * 16);
// XXX come up with a way not to do this for EVERY little access but
@@ -1978,6 +1979,7 @@ NVC0LoweringPass::visit(Instruction *i)
}
i->setIndirect(0, 1, NULL);
i->setIndirect(0, 0, ptr);
+ i->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL;
bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, length);
i->setPredicate(CC_NOT_P, pred);
if (i->defExists(0)) {
@@ -1987,7 +1989,7 @@ NVC0LoweringPass::visit(Instruction *i)
break;
case OP_ATOM:
{
- const bool cctl = i->src(0).getFile() == FILE_MEMORY_GLOBAL;
+ const bool cctl = i->src(0).getFile() == FILE_MEMORY_BUFFER;
handleATOM(i);
handleCasExch(i, cctl);
}
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
index cfa85ec..870b36e 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
@@ -455,6 +455,7 @@ int Symbol::print(char *buf, size_t size,
case FILE_MEMORY_CONST: c = 'c'; break;
case FILE_SHADER_INPUT: c = 'a'; break;
case FILE_SHADER_OUTPUT: c = 'o'; break;
+ case FILE_MEMORY_BUFFER: c = 'b'; break; // Only used before lowering
case FILE_MEMORY_GLOBAL: c = 'g'; break;
case FILE_MEMORY_SHARED: c = 's'; break;
case FILE_MEMORY_LOCAL: c = 'l'; break;
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
index 2c4d7f5..2af1715 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp
@@ -207,6 +207,7 @@ TargetNV50::getFileSize(DataFile file) const
case FILE_MEMORY_CONST: return 65536;
case FILE_SHADER_INPUT: return 0x200;
case FILE_SHADER_OUTPUT: return 0x200;
+ case FILE_MEMORY_BUFFER: return 0xffffffff;
case FILE_MEMORY_GLOBAL: return 0xffffffff;
case FILE_MEMORY_SHARED: return 16 << 10;
case FILE_MEMORY_LOCAL: return 48 << 10;
@@ -406,7 +407,8 @@ TargetNV50::isAccessSupported(DataFile file, DataType ty) const
if (ty == TYPE_B96 || ty == TYPE_NONE)
return false;
if (typeSizeof(ty) > 4)
- return (file == FILE_MEMORY_LOCAL) || (file == FILE_MEMORY_GLOBAL);
+ return (file == FILE_MEMORY_LOCAL) || (file == FILE_MEMORY_GLOBAL) ||
+ (file == FILE_MEMORY_BUFFER);
return true;
}
@@ -509,6 +511,7 @@ int TargetNV50::getLatency(const Instruction *i) const
switch (i->src(0).getFile()) {
case FILE_MEMORY_LOCAL:
case FILE_MEMORY_GLOBAL:
+ case FILE_MEMORY_BUFFER:
return 100; // really 400 to 800
default:
return 22;
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp
index a03afa8..9e1e7bf 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp
@@ -248,6 +248,7 @@ TargetNVC0::getFileSize(DataFile file) const
case FILE_MEMORY_CONST: return 65536;
case FILE_SHADER_INPUT: return 0x400;
case FILE_SHADER_OUTPUT: return 0x400;
+ case FILE_MEMORY_BUFFER: return 0xffffffff;
case FILE_MEMORY_GLOBAL: return 0xffffffff;
case FILE_MEMORY_SHARED: return 16 << 10;
case FILE_MEMORY_LOCAL: return 48 << 10;
--
2.7.3
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply related [flat|nested] 9+ messages in thread[parent not found: <1458230823-25213-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]
* [PATCH mesa v2 2/2] nouveau: codegen: Add support for OpenCL global memory buffers [not found] ` <1458230823-25213-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> @ 2016-03-17 16:07 ` Hans de Goede 2016-03-21 11:26 ` [Mesa-dev, v2, 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers Hans de Goede 2016-03-23 22:10 ` [PATCH mesa v2 " Samuel Pitoiset 2 siblings, 0 replies; 9+ messages in thread From: Hans de Goede @ 2016-03-17 16:07 UTC (permalink / raw) To: Ilia Mirkin, Samuel Pitoiset Cc: mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Add support for OpenCL global memory buffers, note this has only been tested with regular load and stores and likely needs more work for e.g. atomic ops. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: -Redo on top of new "Use FILE_MEMORY_BUFFER for buffers" patch --- src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp index 7ae0cb2..a7a1d54 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp @@ -1286,7 +1286,9 @@ bool Source::scanInstruction(const struct tgsi_full_instruction *inst) if (dst.isIndirect(0)) indirectTempArrays.insert(dst.getArrayId()); } else - if (dst.getFile() == TGSI_FILE_BUFFER) { + if (dst.getFile() == TGSI_FILE_BUFFER || + (dst.getFile() == TGSI_FILE_MEMORY && + memoryFiles[dst.getIndex(0)].mem_type == TGSI_MEMORY_TYPE_GLOBAL)) { info->io.globalAccess |= 0x2; } } @@ -1297,7 +1299,9 @@ bool Source::scanInstruction(const struct tgsi_full_instruction *inst) if (src.isIndirect(0)) indirectTempArrays.insert(src.getArrayId()); } else - if (src.getFile() == TGSI_FILE_BUFFER) { + if (src.getFile() == TGSI_FILE_BUFFER || + (src.getFile() == TGSI_FILE_MEMORY && + memoryFiles[src.getIndex(0)].mem_type == TGSI_MEMORY_TYPE_GLOBAL)) { info->io.globalAccess |= (insn.getOpcode() == TGSI_OPCODE_LOAD) ? 0x1 : 0x2; } else @@ -1531,6 +1535,10 @@ Converter::makeSym(uint tgsiFile, int fileIdx, int idx, int c, uint32_t address) if (tgsiFile == TGSI_FILE_MEMORY) { switch (code->memoryFiles[fileIdx].mem_type) { + case TGSI_MEMORY_TYPE_GLOBAL: + /* No-op this is the default for TGSI_FILE_MEMORY */ + sym->setFile(FILE_MEMORY_GLOBAL); + break; case TGSI_MEMORY_TYPE_SHARED: sym->setFile(FILE_MEMORY_SHARED); break; -- 2.7.3 _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Mesa-dev, v2, 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers [not found] ` <1458230823-25213-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-03-17 16:07 ` [PATCH mesa v2 2/2] nouveau: codegen: Add support for OpenCL global memory buffers Hans de Goede @ 2016-03-21 11:26 ` Hans de Goede 2016-03-23 22:10 ` [PATCH mesa v2 " Samuel Pitoiset 2 siblings, 0 replies; 9+ messages in thread From: Hans de Goede @ 2016-03-21 11:26 UTC (permalink / raw) To: Ilia Mirkin, Samuel Pitoiset Cc: mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Hi, On 17-03-16 17:07, Hans de Goede wrote: > Some of the lowering steps we currently do for FILE_MEMORY_GLOBAL only > apply to buffers, making it impossible to use FILE_MEMORY_GLOBAL for > OpenCL global buffers. > > This commits changes the buffer code to use FILE_MEMORY_BUFFER at the > ir_from_tgsi and lowering steps, freeing use of FILE_MEMORY_GLOBAL > for use with OpenCL global buffers. > > Note that after lowering buffer accesses use the FILE_MEMORY_GLOBAL > register file. > > Tested with piglet on a gk107, before this patch: > ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader > [9/9] pass: 9 / > after: > ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader > [9/9] pass: 9 / > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Ping, any chance I can get a review of these 2 patches ? Thanks, Hans > --- > Changes in v2: > -New patch in v2 of patch-set to re-enable support for global opencl buffers > --- > src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + > src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +- > src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 8 +++++--- > src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 1 + > src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 5 ++++- > src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | 1 + > 6 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h > index 7b0eb2f..5141fc6 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h > @@ -332,6 +332,7 @@ enum DataFile > FILE_MEMORY_CONST, > FILE_SHADER_INPUT, > FILE_SHADER_OUTPUT, > + FILE_MEMORY_BUFFER, > FILE_MEMORY_GLOBAL, > FILE_MEMORY_SHARED, > FILE_MEMORY_LOCAL, > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > index baa2e30..7ae0cb2 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > @@ -373,7 +373,7 @@ static nv50_ir::DataFile translateFile(uint file) > case TGSI_FILE_PREDICATE: return nv50_ir::FILE_PREDICATE; > case TGSI_FILE_IMMEDIATE: return nv50_ir::FILE_IMMEDIATE; > case TGSI_FILE_SYSTEM_VALUE: return nv50_ir::FILE_SYSTEM_VALUE; > - case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_GLOBAL; > + case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_BUFFER; > case TGSI_FILE_MEMORY: return nv50_ir::FILE_MEMORY_GLOBAL; > case TGSI_FILE_SAMPLER: > case TGSI_FILE_NULL: > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp > index d0936d8..628deb7 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp > @@ -1141,13 +1141,14 @@ NVC0LoweringPass::handleATOM(Instruction *atom) > handleSharedATOM(atom); > return true; > default: > - assert(atom->src(0).getFile() == FILE_MEMORY_GLOBAL); > + assert(atom->src(0).getFile() == FILE_MEMORY_BUFFER); > base = loadResInfo64(ind, atom->getSrc(0)->reg.fileIndex * 16); > assert(base->reg.size == 8); > if (ptr) > base = bld.mkOp2v(OP_ADD, TYPE_U64, base, base, ptr); > assert(base->reg.size == 8); > atom->setIndirect(0, 0, base); > + atom->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; > return true; > } > base = > @@ -1963,7 +1964,7 @@ NVC0LoweringPass::visit(Instruction *i) > } else if (i->src(0).getFile() == FILE_SHADER_OUTPUT) { > assert(prog->getType() == Program::TYPE_TESSELLATION_CONTROL); > i->op = OP_VFETCH; > - } else if (i->src(0).getFile() == FILE_MEMORY_GLOBAL) { > + } else if (i->src(0).getFile() == FILE_MEMORY_BUFFER) { > Value *ind = i->getIndirect(0, 1); > Value *ptr = loadResInfo64(ind, i->getSrc(0)->reg.fileIndex * 16); > // XXX come up with a way not to do this for EVERY little access but > @@ -1978,6 +1979,7 @@ NVC0LoweringPass::visit(Instruction *i) > } > i->setIndirect(0, 1, NULL); > i->setIndirect(0, 0, ptr); > + i->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; > bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, length); > i->setPredicate(CC_NOT_P, pred); > if (i->defExists(0)) { > @@ -1987,7 +1989,7 @@ NVC0LoweringPass::visit(Instruction *i) > break; > case OP_ATOM: > { > - const bool cctl = i->src(0).getFile() == FILE_MEMORY_GLOBAL; > + const bool cctl = i->src(0).getFile() == FILE_MEMORY_BUFFER; > handleATOM(i); > handleCasExch(i, cctl); > } > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp > index cfa85ec..870b36e 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp > @@ -455,6 +455,7 @@ int Symbol::print(char *buf, size_t size, > case FILE_MEMORY_CONST: c = 'c'; break; > case FILE_SHADER_INPUT: c = 'a'; break; > case FILE_SHADER_OUTPUT: c = 'o'; break; > + case FILE_MEMORY_BUFFER: c = 'b'; break; // Only used before lowering > case FILE_MEMORY_GLOBAL: c = 'g'; break; > case FILE_MEMORY_SHARED: c = 's'; break; > case FILE_MEMORY_LOCAL: c = 'l'; break; > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp > index 2c4d7f5..2af1715 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp > @@ -207,6 +207,7 @@ TargetNV50::getFileSize(DataFile file) const > case FILE_MEMORY_CONST: return 65536; > case FILE_SHADER_INPUT: return 0x200; > case FILE_SHADER_OUTPUT: return 0x200; > + case FILE_MEMORY_BUFFER: return 0xffffffff; > case FILE_MEMORY_GLOBAL: return 0xffffffff; > case FILE_MEMORY_SHARED: return 16 << 10; > case FILE_MEMORY_LOCAL: return 48 << 10; > @@ -406,7 +407,8 @@ TargetNV50::isAccessSupported(DataFile file, DataType ty) const > if (ty == TYPE_B96 || ty == TYPE_NONE) > return false; > if (typeSizeof(ty) > 4) > - return (file == FILE_MEMORY_LOCAL) || (file == FILE_MEMORY_GLOBAL); > + return (file == FILE_MEMORY_LOCAL) || (file == FILE_MEMORY_GLOBAL) || > + (file == FILE_MEMORY_BUFFER); > return true; > } > > @@ -509,6 +511,7 @@ int TargetNV50::getLatency(const Instruction *i) const > switch (i->src(0).getFile()) { > case FILE_MEMORY_LOCAL: > case FILE_MEMORY_GLOBAL: > + case FILE_MEMORY_BUFFER: > return 100; // really 400 to 800 > default: > return 22; > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp > index a03afa8..9e1e7bf 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp > @@ -248,6 +248,7 @@ TargetNVC0::getFileSize(DataFile file) const > case FILE_MEMORY_CONST: return 65536; > case FILE_SHADER_INPUT: return 0x400; > case FILE_SHADER_OUTPUT: return 0x400; > + case FILE_MEMORY_BUFFER: return 0xffffffff; > case FILE_MEMORY_GLOBAL: return 0xffffffff; > case FILE_MEMORY_SHARED: return 16 << 10; > case FILE_MEMORY_LOCAL: return 48 << 10; > _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH mesa v2 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers [not found] ` <1458230823-25213-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2016-03-17 16:07 ` [PATCH mesa v2 2/2] nouveau: codegen: Add support for OpenCL global memory buffers Hans de Goede 2016-03-21 11:26 ` [Mesa-dev, v2, 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers Hans de Goede @ 2016-03-23 22:10 ` Samuel Pitoiset 2016-04-08 10:17 ` Hans de Goede 2 siblings, 1 reply; 9+ messages in thread From: Samuel Pitoiset @ 2016-03-23 22:10 UTC (permalink / raw) To: Hans de Goede, Ilia Mirkin Cc: mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Are you sure this won't break compute shaders on fermi? Could you please double-check that? One minor comment below. On 03/17/2016 05:07 PM, Hans de Goede wrote: > Some of the lowering steps we currently do for FILE_MEMORY_GLOBAL only > apply to buffers, making it impossible to use FILE_MEMORY_GLOBAL for > OpenCL global buffers. > > This commits changes the buffer code to use FILE_MEMORY_BUFFER at the > ir_from_tgsi and lowering steps, freeing use of FILE_MEMORY_GLOBAL > for use with OpenCL global buffers. > > Note that after lowering buffer accesses use the FILE_MEMORY_GLOBAL > register file. > > Tested with piglet on a gk107, before this patch: > ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader > [9/9] pass: 9 / > after: > ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader > [9/9] pass: 9 / > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > Changes in v2: > -New patch in v2 of patch-set to re-enable support for global opencl buffers > --- > src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + > src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +- > src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 8 +++++--- > src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 1 + > src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 5 ++++- > src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | 1 + > 6 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h > index 7b0eb2f..5141fc6 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h > @@ -332,6 +332,7 @@ enum DataFile > FILE_MEMORY_CONST, > FILE_SHADER_INPUT, > FILE_SHADER_OUTPUT, > + FILE_MEMORY_BUFFER, > FILE_MEMORY_GLOBAL, > FILE_MEMORY_SHARED, > FILE_MEMORY_LOCAL, > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > index baa2e30..7ae0cb2 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > @@ -373,7 +373,7 @@ static nv50_ir::DataFile translateFile(uint file) > case TGSI_FILE_PREDICATE: return nv50_ir::FILE_PREDICATE; > case TGSI_FILE_IMMEDIATE: return nv50_ir::FILE_IMMEDIATE; > case TGSI_FILE_SYSTEM_VALUE: return nv50_ir::FILE_SYSTEM_VALUE; > - case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_GLOBAL; > + case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_BUFFER; > case TGSI_FILE_MEMORY: return nv50_ir::FILE_MEMORY_GLOBAL; > case TGSI_FILE_SAMPLER: > case TGSI_FILE_NULL: > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp > index d0936d8..628deb7 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp > @@ -1141,13 +1141,14 @@ NVC0LoweringPass::handleATOM(Instruction *atom) > handleSharedATOM(atom); > return true; > default: > - assert(atom->src(0).getFile() == FILE_MEMORY_GLOBAL); > + assert(atom->src(0).getFile() == FILE_MEMORY_BUFFER); > base = loadResInfo64(ind, atom->getSrc(0)->reg.fileIndex * 16); > assert(base->reg.size == 8); > if (ptr) > base = bld.mkOp2v(OP_ADD, TYPE_U64, base, base, ptr); > assert(base->reg.size == 8); > atom->setIndirect(0, 0, base); > + atom->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; > return true; > } > base = > @@ -1963,7 +1964,7 @@ NVC0LoweringPass::visit(Instruction *i) > } else if (i->src(0).getFile() == FILE_SHADER_OUTPUT) { > assert(prog->getType() == Program::TYPE_TESSELLATION_CONTROL); > i->op = OP_VFETCH; > - } else if (i->src(0).getFile() == FILE_MEMORY_GLOBAL) { > + } else if (i->src(0).getFile() == FILE_MEMORY_BUFFER) { > Value *ind = i->getIndirect(0, 1); > Value *ptr = loadResInfo64(ind, i->getSrc(0)->reg.fileIndex * 16); > // XXX come up with a way not to do this for EVERY little access but > @@ -1978,6 +1979,7 @@ NVC0LoweringPass::visit(Instruction *i) > } > i->setIndirect(0, 1, NULL); > i->setIndirect(0, 0, ptr); > + i->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; > bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, length); > i->setPredicate(CC_NOT_P, pred); > if (i->defExists(0)) { > @@ -1987,7 +1989,7 @@ NVC0LoweringPass::visit(Instruction *i) > break; > case OP_ATOM: > { > - const bool cctl = i->src(0).getFile() == FILE_MEMORY_GLOBAL; > + const bool cctl = i->src(0).getFile() == FILE_MEMORY_BUFFER; > handleATOM(i); > handleCasExch(i, cctl); > } > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp > index cfa85ec..870b36e 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp > @@ -455,6 +455,7 @@ int Symbol::print(char *buf, size_t size, > case FILE_MEMORY_CONST: c = 'c'; break; > case FILE_SHADER_INPUT: c = 'a'; break; > case FILE_SHADER_OUTPUT: c = 'o'; break; > + case FILE_MEMORY_BUFFER: c = 'b'; break; // Only used before lowering Could you please show me the output of NV50_PROG_DEBUG=255 with a test which uses this file type? I'm not sure if using b[] is better than g[] actually. > case FILE_MEMORY_GLOBAL: c = 'g'; break; > case FILE_MEMORY_SHARED: c = 's'; break; > case FILE_MEMORY_LOCAL: c = 'l'; break; > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp > index 2c4d7f5..2af1715 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp > @@ -207,6 +207,7 @@ TargetNV50::getFileSize(DataFile file) const > case FILE_MEMORY_CONST: return 65536; > case FILE_SHADER_INPUT: return 0x200; > case FILE_SHADER_OUTPUT: return 0x200; > + case FILE_MEMORY_BUFFER: return 0xffffffff; > case FILE_MEMORY_GLOBAL: return 0xffffffff; > case FILE_MEMORY_SHARED: return 16 << 10; > case FILE_MEMORY_LOCAL: return 48 << 10; > @@ -406,7 +407,8 @@ TargetNV50::isAccessSupported(DataFile file, DataType ty) const > if (ty == TYPE_B96 || ty == TYPE_NONE) > return false; > if (typeSizeof(ty) > 4) > - return (file == FILE_MEMORY_LOCAL) || (file == FILE_MEMORY_GLOBAL); > + return (file == FILE_MEMORY_LOCAL) || (file == FILE_MEMORY_GLOBAL) || > + (file == FILE_MEMORY_BUFFER); > return true; > } > > @@ -509,6 +511,7 @@ int TargetNV50::getLatency(const Instruction *i) const > switch (i->src(0).getFile()) { > case FILE_MEMORY_LOCAL: > case FILE_MEMORY_GLOBAL: > + case FILE_MEMORY_BUFFER: > return 100; // really 400 to 800 > default: > return 22; > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp > index a03afa8..9e1e7bf 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp > @@ -248,6 +248,7 @@ TargetNVC0::getFileSize(DataFile file) const > case FILE_MEMORY_CONST: return 65536; > case FILE_SHADER_INPUT: return 0x400; > case FILE_SHADER_OUTPUT: return 0x400; > + case FILE_MEMORY_BUFFER: return 0xffffffff; > case FILE_MEMORY_GLOBAL: return 0xffffffff; > case FILE_MEMORY_SHARED: return 16 << 10; > case FILE_MEMORY_LOCAL: return 48 << 10; > _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH mesa v2 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers 2016-03-23 22:10 ` [PATCH mesa v2 " Samuel Pitoiset @ 2016-04-08 10:17 ` Hans de Goede [not found] ` <57078551.1080703-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 0 siblings, 1 reply; 9+ messages in thread From: Hans de Goede @ 2016-04-08 10:17 UTC (permalink / raw) To: Samuel Pitoiset, Ilia Mirkin; +Cc: mesa-dev, nouveau Hi, On 23-03-16 23:10, Samuel Pitoiset wrote: > Are you sure this won't break compute shaders on fermi? > Could you please double-check that? I just checked: lspci: 01:00.0 VGA compatible controller: NVIDIA Corporation GF119 [GeForce GT 610] (rev a1) Before this patch-set: [hans@plank piglit]$ ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader [9/9] pass: 9 / After this patch-set: [hans@plank piglit]$ ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader [9/9] pass: 9 / > One minor comment below. > > On 03/17/2016 05:07 PM, Hans de Goede wrote: >> Some of the lowering steps we currently do for FILE_MEMORY_GLOBAL only >> apply to buffers, making it impossible to use FILE_MEMORY_GLOBAL for >> OpenCL global buffers. >> >> This commits changes the buffer code to use FILE_MEMORY_BUFFER at the >> ir_from_tgsi and lowering steps, freeing use of FILE_MEMORY_GLOBAL >> for use with OpenCL global buffers. >> >> Note that after lowering buffer accesses use the FILE_MEMORY_GLOBAL >> register file. >> >> Tested with piglet on a gk107, before this patch: >> ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader >> [9/9] pass: 9 / >> after: >> ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' results/shader >> [9/9] pass: 9 / >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> Changes in v2: >> -New patch in v2 of patch-set to re-enable support for global opencl buffers >> --- >> src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + >> src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +- >> src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 8 +++++--- >> src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 1 + >> src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 5 ++++- >> src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | 1 + >> 6 files changed, 13 insertions(+), 5 deletions(-) >> >> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h >> index 7b0eb2f..5141fc6 100644 >> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h >> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h >> @@ -332,6 +332,7 @@ enum DataFile >> FILE_MEMORY_CONST, >> FILE_SHADER_INPUT, >> FILE_SHADER_OUTPUT, >> + FILE_MEMORY_BUFFER, >> FILE_MEMORY_GLOBAL, >> FILE_MEMORY_SHARED, >> FILE_MEMORY_LOCAL, >> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >> index baa2e30..7ae0cb2 100644 >> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >> @@ -373,7 +373,7 @@ static nv50_ir::DataFile translateFile(uint file) >> case TGSI_FILE_PREDICATE: return nv50_ir::FILE_PREDICATE; >> case TGSI_FILE_IMMEDIATE: return nv50_ir::FILE_IMMEDIATE; >> case TGSI_FILE_SYSTEM_VALUE: return nv50_ir::FILE_SYSTEM_VALUE; >> - case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_GLOBAL; >> + case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_BUFFER; >> case TGSI_FILE_MEMORY: return nv50_ir::FILE_MEMORY_GLOBAL; >> case TGSI_FILE_SAMPLER: >> case TGSI_FILE_NULL: >> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >> index d0936d8..628deb7 100644 >> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >> @@ -1141,13 +1141,14 @@ NVC0LoweringPass::handleATOM(Instruction *atom) >> handleSharedATOM(atom); >> return true; >> default: >> - assert(atom->src(0).getFile() == FILE_MEMORY_GLOBAL); >> + assert(atom->src(0).getFile() == FILE_MEMORY_BUFFER); >> base = loadResInfo64(ind, atom->getSrc(0)->reg.fileIndex * 16); >> assert(base->reg.size == 8); >> if (ptr) >> base = bld.mkOp2v(OP_ADD, TYPE_U64, base, base, ptr); >> assert(base->reg.size == 8); >> atom->setIndirect(0, 0, base); >> + atom->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; >> return true; >> } >> base = >> @@ -1963,7 +1964,7 @@ NVC0LoweringPass::visit(Instruction *i) >> } else if (i->src(0).getFile() == FILE_SHADER_OUTPUT) { >> assert(prog->getType() == Program::TYPE_TESSELLATION_CONTROL); >> i->op = OP_VFETCH; >> - } else if (i->src(0).getFile() == FILE_MEMORY_GLOBAL) { >> + } else if (i->src(0).getFile() == FILE_MEMORY_BUFFER) { >> Value *ind = i->getIndirect(0, 1); >> Value *ptr = loadResInfo64(ind, i->getSrc(0)->reg.fileIndex * 16); >> // XXX come up with a way not to do this for EVERY little access but >> @@ -1978,6 +1979,7 @@ NVC0LoweringPass::visit(Instruction *i) >> } >> i->setIndirect(0, 1, NULL); >> i->setIndirect(0, 0, ptr); >> + i->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; >> bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, length); >> i->setPredicate(CC_NOT_P, pred); >> if (i->defExists(0)) { >> @@ -1987,7 +1989,7 @@ NVC0LoweringPass::visit(Instruction *i) >> break; >> case OP_ATOM: >> { >> - const bool cctl = i->src(0).getFile() == FILE_MEMORY_GLOBAL; >> + const bool cctl = i->src(0).getFile() == FILE_MEMORY_BUFFER; >> handleATOM(i); >> handleCasExch(i, cctl); >> } >> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >> index cfa85ec..870b36e 100644 >> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >> @@ -455,6 +455,7 @@ int Symbol::print(char *buf, size_t size, >> case FILE_MEMORY_CONST: c = 'c'; break; >> case FILE_SHADER_INPUT: c = 'a'; break; >> case FILE_SHADER_OUTPUT: c = 'o'; break; >> + case FILE_MEMORY_BUFFER: c = 'b'; break; // Only used before lowering > > Could you please show me the output of NV50_PROG_DEBUG=255 with a test which uses this file type? I'm not sure if using b[] is better than g[] actually. NV50_PROG_DEBUG=255 bin/arb_shader_storage_buffer_object-rendering ... MAIN:-1 () BB:0 (52 instructions) - df = { } -> BB:1 (tree) 0: mov u32 %r1 0x00000000 (0) 1: ld u32 %r0 b[0x0] (0) 2: presin f32 %r3 %r0 (0) 3: cos f32 %r3 %r3 (0) 4: mov u32 %r2 %r3 (0) ... And after the first lowering step: MAIN:-1 () BB:0 (77 instructions) - df = { } -> BB:1 (tree) 0: mov u32 %r56 0x00000000 (0) 1: ld u64 %r57d c15[0x300] (0) 2: mov u32 %r58 0x00000004 (0) 3: ld u32 %r59 c15[0x308] (0) 4: set u8 %p60 gt u32 %r58 %r59 (0) 5: mov u32 %r61 0x00000000 (0) 6: not %p60 ld u32 %r62 g[%r57d+0x0] (0) ... Note how the 'b' printing is only used before the buffer access is lowered to a global access, so this seems to be the right thing todo. Regards, Hans > >> case FILE_MEMORY_GLOBAL: c = 'g'; break; >> case FILE_MEMORY_SHARED: c = 's'; break; >> case FILE_MEMORY_LOCAL: c = 'l'; break; >> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >> index 2c4d7f5..2af1715 100644 >> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >> @@ -207,6 +207,7 @@ TargetNV50::getFileSize(DataFile file) const >> case FILE_MEMORY_CONST: return 65536; >> case FILE_SHADER_INPUT: return 0x200; >> case FILE_SHADER_OUTPUT: return 0x200; >> + case FILE_MEMORY_BUFFER: return 0xffffffff; >> case FILE_MEMORY_GLOBAL: return 0xffffffff; >> case FILE_MEMORY_SHARED: return 16 << 10; >> case FILE_MEMORY_LOCAL: return 48 << 10; >> @@ -406,7 +407,8 @@ TargetNV50::isAccessSupported(DataFile file, DataType ty) const >> if (ty == TYPE_B96 || ty == TYPE_NONE) >> return false; >> if (typeSizeof(ty) > 4) >> - return (file == FILE_MEMORY_LOCAL) || (file == FILE_MEMORY_GLOBAL); >> + return (file == FILE_MEMORY_LOCAL) || (file == FILE_MEMORY_GLOBAL) || >> + (file == FILE_MEMORY_BUFFER); >> return true; >> } >> >> @@ -509,6 +511,7 @@ int TargetNV50::getLatency(const Instruction *i) const >> switch (i->src(0).getFile()) { >> case FILE_MEMORY_LOCAL: >> case FILE_MEMORY_GLOBAL: >> + case FILE_MEMORY_BUFFER: >> return 100; // really 400 to 800 >> default: >> return 22; >> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >> index a03afa8..9e1e7bf 100644 >> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >> @@ -248,6 +248,7 @@ TargetNVC0::getFileSize(DataFile file) const >> case FILE_MEMORY_CONST: return 65536; >> case FILE_SHADER_INPUT: return 0x400; >> case FILE_SHADER_OUTPUT: return 0x400; >> + case FILE_MEMORY_BUFFER: return 0xffffffff; >> case FILE_MEMORY_GLOBAL: return 0xffffffff; >> case FILE_MEMORY_SHARED: return 16 << 10; >> case FILE_MEMORY_LOCAL: return 48 << 10; >> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <57078551.1080703-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]
* Re: [PATCH mesa v2 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers [not found] ` <57078551.1080703-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> @ 2016-04-08 16:14 ` Samuel Pitoiset [not found] ` <5707D8D7.8050403-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 9+ messages in thread From: Samuel Pitoiset @ 2016-04-08 16:14 UTC (permalink / raw) To: Hans de Goede, Ilia Mirkin Cc: mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW On 04/08/2016 12:17 PM, Hans de Goede wrote: > Hi, > > On 23-03-16 23:10, Samuel Pitoiset wrote: >> Are you sure this won't break compute shaders on fermi? >> Could you please double-check that? > > I just checked: > > lspci: > 01:00.0 VGA compatible controller: NVIDIA Corporation GF119 [GeForce GT > 610] (rev a1) > > Before this patch-set: > > [hans@plank piglit]$ ./piglit run -o shader -t > '.*arb_shader_storage_buffer_object.*' results/shader > [9/9] pass: 9 / > > After this patch-set: > > [hans@plank piglit]$ ./piglit run -o shader -t > '.*arb_shader_storage_buffer_object.*' results/shader > [9/9] pass: 9 / And what about compute shaders? (ie. -t arb_compute_shader) Sorry to ask you again but I just want to be sure it's fine. :-) > >> One minor comment below. >> >> On 03/17/2016 05:07 PM, Hans de Goede wrote: >>> Some of the lowering steps we currently do for FILE_MEMORY_GLOBAL only >>> apply to buffers, making it impossible to use FILE_MEMORY_GLOBAL for >>> OpenCL global buffers. >>> >>> This commits changes the buffer code to use FILE_MEMORY_BUFFER at the >>> ir_from_tgsi and lowering steps, freeing use of FILE_MEMORY_GLOBAL >>> for use with OpenCL global buffers. >>> >>> Note that after lowering buffer accesses use the FILE_MEMORY_GLOBAL >>> register file. >>> >>> Tested with piglet on a gk107, before this patch: >>> ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' >>> results/shader >>> [9/9] pass: 9 / >>> after: >>> ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' >>> results/shader >>> [9/9] pass: 9 / >>> >>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>> --- >>> Changes in v2: >>> -New patch in v2 of patch-set to re-enable support for global opencl >>> buffers >>> --- >>> src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + >>> src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +- >>> src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 8 >>> +++++--- >>> src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 1 + >>> src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 5 >>> ++++- >>> src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | 1 + >>> 6 files changed, 13 insertions(+), 5 deletions(-) >>> >>> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>> b/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>> index 7b0eb2f..5141fc6 100644 >>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>> @@ -332,6 +332,7 @@ enum DataFile >>> FILE_MEMORY_CONST, >>> FILE_SHADER_INPUT, >>> FILE_SHADER_OUTPUT, >>> + FILE_MEMORY_BUFFER, >>> FILE_MEMORY_GLOBAL, >>> FILE_MEMORY_SHARED, >>> FILE_MEMORY_LOCAL, >>> diff --git >>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>> index baa2e30..7ae0cb2 100644 >>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>> @@ -373,7 +373,7 @@ static nv50_ir::DataFile translateFile(uint file) >>> case TGSI_FILE_PREDICATE: return nv50_ir::FILE_PREDICATE; >>> case TGSI_FILE_IMMEDIATE: return nv50_ir::FILE_IMMEDIATE; >>> case TGSI_FILE_SYSTEM_VALUE: return nv50_ir::FILE_SYSTEM_VALUE; >>> - case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_GLOBAL; >>> + case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_BUFFER; >>> case TGSI_FILE_MEMORY: return nv50_ir::FILE_MEMORY_GLOBAL; >>> case TGSI_FILE_SAMPLER: >>> case TGSI_FILE_NULL: >>> diff --git >>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>> index d0936d8..628deb7 100644 >>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>> @@ -1141,13 +1141,14 @@ NVC0LoweringPass::handleATOM(Instruction *atom) >>> handleSharedATOM(atom); >>> return true; >>> default: >>> - assert(atom->src(0).getFile() == FILE_MEMORY_GLOBAL); >>> + assert(atom->src(0).getFile() == FILE_MEMORY_BUFFER); >>> base = loadResInfo64(ind, atom->getSrc(0)->reg.fileIndex * 16); >>> assert(base->reg.size == 8); >>> if (ptr) >>> base = bld.mkOp2v(OP_ADD, TYPE_U64, base, base, ptr); >>> assert(base->reg.size == 8); >>> atom->setIndirect(0, 0, base); >>> + atom->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; >>> return true; >>> } >>> base = >>> @@ -1963,7 +1964,7 @@ NVC0LoweringPass::visit(Instruction *i) >>> } else if (i->src(0).getFile() == FILE_SHADER_OUTPUT) { >>> assert(prog->getType() == >>> Program::TYPE_TESSELLATION_CONTROL); >>> i->op = OP_VFETCH; >>> - } else if (i->src(0).getFile() == FILE_MEMORY_GLOBAL) { >>> + } else if (i->src(0).getFile() == FILE_MEMORY_BUFFER) { >>> Value *ind = i->getIndirect(0, 1); >>> Value *ptr = loadResInfo64(ind, >>> i->getSrc(0)->reg.fileIndex * 16); >>> // XXX come up with a way not to do this for EVERY little >>> access but >>> @@ -1978,6 +1979,7 @@ NVC0LoweringPass::visit(Instruction *i) >>> } >>> i->setIndirect(0, 1, NULL); >>> i->setIndirect(0, 0, ptr); >>> + i->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; >>> bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, >>> length); >>> i->setPredicate(CC_NOT_P, pred); >>> if (i->defExists(0)) { >>> @@ -1987,7 +1989,7 @@ NVC0LoweringPass::visit(Instruction *i) >>> break; >>> case OP_ATOM: >>> { >>> - const bool cctl = i->src(0).getFile() == FILE_MEMORY_GLOBAL; >>> + const bool cctl = i->src(0).getFile() == FILE_MEMORY_BUFFER; >>> handleATOM(i); >>> handleCasExch(i, cctl); >>> } >>> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>> index cfa85ec..870b36e 100644 >>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>> @@ -455,6 +455,7 @@ int Symbol::print(char *buf, size_t size, >>> case FILE_MEMORY_CONST: c = 'c'; break; >>> case FILE_SHADER_INPUT: c = 'a'; break; >>> case FILE_SHADER_OUTPUT: c = 'o'; break; >>> + case FILE_MEMORY_BUFFER: c = 'b'; break; // Only used before >>> lowering >> >> Could you please show me the output of NV50_PROG_DEBUG=255 with a test >> which uses this file type? I'm not sure if using b[] is better than >> g[] actually. > > NV50_PROG_DEBUG=255 bin/arb_shader_storage_buffer_object-rendering > > ... > > MAIN:-1 () > BB:0 (52 instructions) - df = { } > -> BB:1 (tree) > 0: mov u32 %r1 0x00000000 (0) > 1: ld u32 %r0 b[0x0] (0) > 2: presin f32 %r3 %r0 (0) > 3: cos f32 %r3 %r3 (0) > 4: mov u32 %r2 %r3 (0) > ... > > And after the first lowering step: > > MAIN:-1 () > BB:0 (77 instructions) - df = { } > -> BB:1 (tree) > 0: mov u32 %r56 0x00000000 (0) > 1: ld u64 %r57d c15[0x300] (0) > 2: mov u32 %r58 0x00000004 (0) > 3: ld u32 %r59 c15[0x308] (0) > 4: set u8 %p60 gt u32 %r58 %r59 (0) > 5: mov u32 %r61 0x00000000 (0) > 6: not %p60 ld u32 %r62 g[%r57d+0x0] (0) > ... > > Note how the 'b' printing is only used before the buffer access > is lowered to a global access, so this seems to be the right thing todo. > Fine by me. Thanks. > Regards, > > Hans > > >> >>> case FILE_MEMORY_GLOBAL: c = 'g'; break; >>> case FILE_MEMORY_SHARED: c = 's'; break; >>> case FILE_MEMORY_LOCAL: c = 'l'; break; >>> diff --git >>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>> index 2c4d7f5..2af1715 100644 >>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>> @@ -207,6 +207,7 @@ TargetNV50::getFileSize(DataFile file) const >>> case FILE_MEMORY_CONST: return 65536; >>> case FILE_SHADER_INPUT: return 0x200; >>> case FILE_SHADER_OUTPUT: return 0x200; >>> + case FILE_MEMORY_BUFFER: return 0xffffffff; >>> case FILE_MEMORY_GLOBAL: return 0xffffffff; >>> case FILE_MEMORY_SHARED: return 16 << 10; >>> case FILE_MEMORY_LOCAL: return 48 << 10; >>> @@ -406,7 +407,8 @@ TargetNV50::isAccessSupported(DataFile file, >>> DataType ty) const >>> if (ty == TYPE_B96 || ty == TYPE_NONE) >>> return false; >>> if (typeSizeof(ty) > 4) >>> - return (file == FILE_MEMORY_LOCAL) || (file == >>> FILE_MEMORY_GLOBAL); >>> + return (file == FILE_MEMORY_LOCAL) || (file == >>> FILE_MEMORY_GLOBAL) || >>> + (file == FILE_MEMORY_BUFFER); >>> return true; >>> } >>> >>> @@ -509,6 +511,7 @@ int TargetNV50::getLatency(const Instruction *i) >>> const >>> switch (i->src(0).getFile()) { >>> case FILE_MEMORY_LOCAL: >>> case FILE_MEMORY_GLOBAL: >>> + case FILE_MEMORY_BUFFER: >>> return 100; // really 400 to 800 >>> default: >>> return 22; >>> diff --git >>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>> index a03afa8..9e1e7bf 100644 >>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>> @@ -248,6 +248,7 @@ TargetNVC0::getFileSize(DataFile file) const >>> case FILE_MEMORY_CONST: return 65536; >>> case FILE_SHADER_INPUT: return 0x400; >>> case FILE_SHADER_OUTPUT: return 0x400; >>> + case FILE_MEMORY_BUFFER: return 0xffffffff; >>> case FILE_MEMORY_GLOBAL: return 0xffffffff; >>> case FILE_MEMORY_SHARED: return 16 << 10; >>> case FILE_MEMORY_LOCAL: return 48 << 10; >>> _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <5707D8D7.8050403-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH mesa v2 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers [not found] ` <5707D8D7.8050403-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2016-04-12 10:04 ` Hans de Goede 2016-04-14 22:29 ` Samuel Pitoiset 0 siblings, 1 reply; 9+ messages in thread From: Hans de Goede @ 2016-04-12 10:04 UTC (permalink / raw) To: Samuel Pitoiset, Ilia Mirkin Cc: mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Hi, On 08-04-16 18:14, Samuel Pitoiset wrote: > > > On 04/08/2016 12:17 PM, Hans de Goede wrote: >> Hi, >> >> On 23-03-16 23:10, Samuel Pitoiset wrote: >>> Are you sure this won't break compute shaders on fermi? >>> Could you please double-check that? >> >> I just checked: >> >> lspci: >> 01:00.0 VGA compatible controller: NVIDIA Corporation GF119 [GeForce GT >> 610] (rev a1) >> >> Before this patch-set: >> >> [hans@plank piglit]$ ./piglit run -o shader -t >> '.*arb_shader_storage_buffer_object.*' results/shader >> [9/9] pass: 9 / >> >> After this patch-set: >> >> [hans@plank piglit]$ ./piglit run -o shader -t >> '.*arb_shader_storage_buffer_object.*' results/shader >> [9/9] pass: 9 / > > And what about compute shaders? (ie. -t arb_compute_shader) > Sorry to ask you again but I just want to be sure it's fine. :-) Those tests don't run yet on mesa master on the GF119 card I've: [hans@plank piglit]$ ./piglit run -o shader -t '.*arb_compute_shader.*' results/shader [20/20] skip: 20 | My patches don't change anything about this, and they only touch the buffer handling paths and the buffer tests (still) pass... I've also tried on a: 01:00.0 VGA compatible controller: NVIDIA Corporation GK107 [GeForce GT 740] (rev a1) Same result. Regards, Hans > >> >>> One minor comment below. >>> >>> On 03/17/2016 05:07 PM, Hans de Goede wrote: >>>> Some of the lowering steps we currently do for FILE_MEMORY_GLOBAL only >>>> apply to buffers, making it impossible to use FILE_MEMORY_GLOBAL for >>>> OpenCL global buffers. >>>> >>>> This commits changes the buffer code to use FILE_MEMORY_BUFFER at the >>>> ir_from_tgsi and lowering steps, freeing use of FILE_MEMORY_GLOBAL >>>> for use with OpenCL global buffers. >>>> >>>> Note that after lowering buffer accesses use the FILE_MEMORY_GLOBAL >>>> register file. >>>> >>>> Tested with piglet on a gk107, before this patch: >>>> ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' >>>> results/shader >>>> [9/9] pass: 9 / >>>> after: >>>> ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' >>>> results/shader >>>> [9/9] pass: 9 / >>>> >>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>>> --- >>>> Changes in v2: >>>> -New patch in v2 of patch-set to re-enable support for global opencl >>>> buffers >>>> --- >>>> src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + >>>> src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +- >>>> src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 8 >>>> +++++--- >>>> src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 1 + >>>> src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 5 >>>> ++++- >>>> src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | 1 + >>>> 6 files changed, 13 insertions(+), 5 deletions(-) >>>> >>>> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>>> index 7b0eb2f..5141fc6 100644 >>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>>> @@ -332,6 +332,7 @@ enum DataFile >>>> FILE_MEMORY_CONST, >>>> FILE_SHADER_INPUT, >>>> FILE_SHADER_OUTPUT, >>>> + FILE_MEMORY_BUFFER, >>>> FILE_MEMORY_GLOBAL, >>>> FILE_MEMORY_SHARED, >>>> FILE_MEMORY_LOCAL, >>>> diff --git >>>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>>> index baa2e30..7ae0cb2 100644 >>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>>> @@ -373,7 +373,7 @@ static nv50_ir::DataFile translateFile(uint file) >>>> case TGSI_FILE_PREDICATE: return nv50_ir::FILE_PREDICATE; >>>> case TGSI_FILE_IMMEDIATE: return nv50_ir::FILE_IMMEDIATE; >>>> case TGSI_FILE_SYSTEM_VALUE: return nv50_ir::FILE_SYSTEM_VALUE; >>>> - case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_GLOBAL; >>>> + case TGSI_FILE_BUFFER: return nv50_ir::FILE_MEMORY_BUFFER; >>>> case TGSI_FILE_MEMORY: return nv50_ir::FILE_MEMORY_GLOBAL; >>>> case TGSI_FILE_SAMPLER: >>>> case TGSI_FILE_NULL: >>>> diff --git >>>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>>> index d0936d8..628deb7 100644 >>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>>> @@ -1141,13 +1141,14 @@ NVC0LoweringPass::handleATOM(Instruction *atom) >>>> handleSharedATOM(atom); >>>> return true; >>>> default: >>>> - assert(atom->src(0).getFile() == FILE_MEMORY_GLOBAL); >>>> + assert(atom->src(0).getFile() == FILE_MEMORY_BUFFER); >>>> base = loadResInfo64(ind, atom->getSrc(0)->reg.fileIndex * 16); >>>> assert(base->reg.size == 8); >>>> if (ptr) >>>> base = bld.mkOp2v(OP_ADD, TYPE_U64, base, base, ptr); >>>> assert(base->reg.size == 8); >>>> atom->setIndirect(0, 0, base); >>>> + atom->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; >>>> return true; >>>> } >>>> base = >>>> @@ -1963,7 +1964,7 @@ NVC0LoweringPass::visit(Instruction *i) >>>> } else if (i->src(0).getFile() == FILE_SHADER_OUTPUT) { >>>> assert(prog->getType() == >>>> Program::TYPE_TESSELLATION_CONTROL); >>>> i->op = OP_VFETCH; >>>> - } else if (i->src(0).getFile() == FILE_MEMORY_GLOBAL) { >>>> + } else if (i->src(0).getFile() == FILE_MEMORY_BUFFER) { >>>> Value *ind = i->getIndirect(0, 1); >>>> Value *ptr = loadResInfo64(ind, >>>> i->getSrc(0)->reg.fileIndex * 16); >>>> // XXX come up with a way not to do this for EVERY little >>>> access but >>>> @@ -1978,6 +1979,7 @@ NVC0LoweringPass::visit(Instruction *i) >>>> } >>>> i->setIndirect(0, 1, NULL); >>>> i->setIndirect(0, 0, ptr); >>>> + i->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; >>>> bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, >>>> length); >>>> i->setPredicate(CC_NOT_P, pred); >>>> if (i->defExists(0)) { >>>> @@ -1987,7 +1989,7 @@ NVC0LoweringPass::visit(Instruction *i) >>>> break; >>>> case OP_ATOM: >>>> { >>>> - const bool cctl = i->src(0).getFile() == FILE_MEMORY_GLOBAL; >>>> + const bool cctl = i->src(0).getFile() == FILE_MEMORY_BUFFER; >>>> handleATOM(i); >>>> handleCasExch(i, cctl); >>>> } >>>> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>>> index cfa85ec..870b36e 100644 >>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>>> @@ -455,6 +455,7 @@ int Symbol::print(char *buf, size_t size, >>>> case FILE_MEMORY_CONST: c = 'c'; break; >>>> case FILE_SHADER_INPUT: c = 'a'; break; >>>> case FILE_SHADER_OUTPUT: c = 'o'; break; >>>> + case FILE_MEMORY_BUFFER: c = 'b'; break; // Only used before >>>> lowering >>> >>> Could you please show me the output of NV50_PROG_DEBUG=255 with a test >>> which uses this file type? I'm not sure if using b[] is better than >>> g[] actually. >> >> NV50_PROG_DEBUG=255 bin/arb_shader_storage_buffer_object-rendering >> >> ... >> >> MAIN:-1 () >> BB:0 (52 instructions) - df = { } >> -> BB:1 (tree) >> 0: mov u32 %r1 0x00000000 (0) >> 1: ld u32 %r0 b[0x0] (0) >> 2: presin f32 %r3 %r0 (0) >> 3: cos f32 %r3 %r3 (0) >> 4: mov u32 %r2 %r3 (0) >> ... >> >> And after the first lowering step: >> >> MAIN:-1 () >> BB:0 (77 instructions) - df = { } >> -> BB:1 (tree) >> 0: mov u32 %r56 0x00000000 (0) >> 1: ld u64 %r57d c15[0x300] (0) >> 2: mov u32 %r58 0x00000004 (0) >> 3: ld u32 %r59 c15[0x308] (0) >> 4: set u8 %p60 gt u32 %r58 %r59 (0) >> 5: mov u32 %r61 0x00000000 (0) >> 6: not %p60 ld u32 %r62 g[%r57d+0x0] (0) >> ... >> >> Note how the 'b' printing is only used before the buffer access >> is lowered to a global access, so this seems to be the right thing todo. >> > > Fine by me. > Thanks. > >> Regards, >> >> Hans >> >> >>> >>>> case FILE_MEMORY_GLOBAL: c = 'g'; break; >>>> case FILE_MEMORY_SHARED: c = 's'; break; >>>> case FILE_MEMORY_LOCAL: c = 'l'; break; >>>> diff --git >>>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>>> index 2c4d7f5..2af1715 100644 >>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>>> @@ -207,6 +207,7 @@ TargetNV50::getFileSize(DataFile file) const >>>> case FILE_MEMORY_CONST: return 65536; >>>> case FILE_SHADER_INPUT: return 0x200; >>>> case FILE_SHADER_OUTPUT: return 0x200; >>>> + case FILE_MEMORY_BUFFER: return 0xffffffff; >>>> case FILE_MEMORY_GLOBAL: return 0xffffffff; >>>> case FILE_MEMORY_SHARED: return 16 << 10; >>>> case FILE_MEMORY_LOCAL: return 48 << 10; >>>> @@ -406,7 +407,8 @@ TargetNV50::isAccessSupported(DataFile file, >>>> DataType ty) const >>>> if (ty == TYPE_B96 || ty == TYPE_NONE) >>>> return false; >>>> if (typeSizeof(ty) > 4) >>>> - return (file == FILE_MEMORY_LOCAL) || (file == >>>> FILE_MEMORY_GLOBAL); >>>> + return (file == FILE_MEMORY_LOCAL) || (file == >>>> FILE_MEMORY_GLOBAL) || >>>> + (file == FILE_MEMORY_BUFFER); >>>> return true; >>>> } >>>> >>>> @@ -509,6 +511,7 @@ int TargetNV50::getLatency(const Instruction *i) >>>> const >>>> switch (i->src(0).getFile()) { >>>> case FILE_MEMORY_LOCAL: >>>> case FILE_MEMORY_GLOBAL: >>>> + case FILE_MEMORY_BUFFER: >>>> return 100; // really 400 to 800 >>>> default: >>>> return 22; >>>> diff --git >>>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>>> index a03afa8..9e1e7bf 100644 >>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>>> @@ -248,6 +248,7 @@ TargetNVC0::getFileSize(DataFile file) const >>>> case FILE_MEMORY_CONST: return 65536; >>>> case FILE_SHADER_INPUT: return 0x400; >>>> case FILE_SHADER_OUTPUT: return 0x400; >>>> + case FILE_MEMORY_BUFFER: return 0xffffffff; >>>> case FILE_MEMORY_GLOBAL: return 0xffffffff; >>>> case FILE_MEMORY_SHARED: return 16 << 10; >>>> case FILE_MEMORY_LOCAL: return 48 << 10; >>>> _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH mesa v2 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers 2016-04-12 10:04 ` Hans de Goede @ 2016-04-14 22:29 ` Samuel Pitoiset [not found] ` <571019E1.2080102-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 9+ messages in thread From: Samuel Pitoiset @ 2016-04-14 22:29 UTC (permalink / raw) To: Hans de Goede, Ilia Mirkin; +Cc: mesa-dev, nouveau On 04/12/2016 12:04 PM, Hans de Goede wrote: > Hi, > > On 08-04-16 18:14, Samuel Pitoiset wrote: >> >> >> On 04/08/2016 12:17 PM, Hans de Goede wrote: >>> Hi, >>> >>> On 23-03-16 23:10, Samuel Pitoiset wrote: >>>> Are you sure this won't break compute shaders on fermi? >>>> Could you please double-check that? >>> >>> I just checked: >>> >>> lspci: >>> 01:00.0 VGA compatible controller: NVIDIA Corporation GF119 [GeForce GT >>> 610] (rev a1) >>> >>> Before this patch-set: >>> >>> [hans@plank piglit]$ ./piglit run -o shader -t >>> '.*arb_shader_storage_buffer_object.*' results/shader >>> [9/9] pass: 9 / >>> >>> After this patch-set: >>> >>> [hans@plank piglit]$ ./piglit run -o shader -t >>> '.*arb_shader_storage_buffer_object.*' results/shader >>> [9/9] pass: 9 / >> >> And what about compute shaders? (ie. -t arb_compute_shader) >> Sorry to ask you again but I just want to be sure it's fine. :-) > > Those tests don't run yet on mesa master on the GF119 card > I've: > > [hans@plank piglit]$ ./piglit run -o shader -t '.*arb_compute_shader.*' > results/shader > [20/20] skip: 20 | > > My patches don't change anything about this, and they only touch > the buffer handling paths and the buffer tests (still) pass... > > I've also tried on a: > 01:00.0 VGA compatible controller: NVIDIA Corporation GK107 [GeForce GT > 740] (rev a1) > > Same result. Sorry for the delay, I was dealing with images. Well, you needed to override ARB_compute_shader because the extension is not currently exposed. For example: MESA_EXTENSION_OVERRIDE=GL_ARB_compute_shader MESA_GL_VERSION_OVERRIDE=4.2 ./piglit-run.py blabla I tried myself to test your series but it no longer applies on top of master. Well, if you make a quick test with: MESA_EXTENSION_OVERRIDE=GL_ARB_compute_shader MESA_GL_VERSION_OVERRIDE=4.2 ./piglit-run.py -1 --dmesg -t arb_compute_shader that might be nice, but whatever, series is: Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> > > Regards, > > Hans > > > >> >>> >>>> One minor comment below. >>>> >>>> On 03/17/2016 05:07 PM, Hans de Goede wrote: >>>>> Some of the lowering steps we currently do for FILE_MEMORY_GLOBAL only >>>>> apply to buffers, making it impossible to use FILE_MEMORY_GLOBAL for >>>>> OpenCL global buffers. >>>>> >>>>> This commits changes the buffer code to use FILE_MEMORY_BUFFER at the >>>>> ir_from_tgsi and lowering steps, freeing use of FILE_MEMORY_GLOBAL >>>>> for use with OpenCL global buffers. >>>>> >>>>> Note that after lowering buffer accesses use the FILE_MEMORY_GLOBAL >>>>> register file. >>>>> >>>>> Tested with piglet on a gk107, before this patch: >>>>> ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' >>>>> results/shader >>>>> [9/9] pass: 9 / >>>>> after: >>>>> ./piglit run -o shader -t '.*arb_shader_storage_buffer_object.*' >>>>> results/shader >>>>> [9/9] pass: 9 / >>>>> >>>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>>>> --- >>>>> Changes in v2: >>>>> -New patch in v2 of patch-set to re-enable support for global opencl >>>>> buffers >>>>> --- >>>>> src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + >>>>> src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 +- >>>>> src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 8 >>>>> +++++--- >>>>> src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 1 + >>>>> src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 5 >>>>> ++++- >>>>> src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp | 1 + >>>>> 6 files changed, 13 insertions(+), 5 deletions(-) >>>>> >>>>> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>>>> index 7b0eb2f..5141fc6 100644 >>>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h >>>>> @@ -332,6 +332,7 @@ enum DataFile >>>>> FILE_MEMORY_CONST, >>>>> FILE_SHADER_INPUT, >>>>> FILE_SHADER_OUTPUT, >>>>> + FILE_MEMORY_BUFFER, >>>>> FILE_MEMORY_GLOBAL, >>>>> FILE_MEMORY_SHARED, >>>>> FILE_MEMORY_LOCAL, >>>>> diff --git >>>>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>>>> index baa2e30..7ae0cb2 100644 >>>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp >>>>> @@ -373,7 +373,7 @@ static nv50_ir::DataFile translateFile(uint file) >>>>> case TGSI_FILE_PREDICATE: return nv50_ir::FILE_PREDICATE; >>>>> case TGSI_FILE_IMMEDIATE: return nv50_ir::FILE_IMMEDIATE; >>>>> case TGSI_FILE_SYSTEM_VALUE: return >>>>> nv50_ir::FILE_SYSTEM_VALUE; >>>>> - case TGSI_FILE_BUFFER: return >>>>> nv50_ir::FILE_MEMORY_GLOBAL; >>>>> + case TGSI_FILE_BUFFER: return >>>>> nv50_ir::FILE_MEMORY_BUFFER; >>>>> case TGSI_FILE_MEMORY: return >>>>> nv50_ir::FILE_MEMORY_GLOBAL; >>>>> case TGSI_FILE_SAMPLER: >>>>> case TGSI_FILE_NULL: >>>>> diff --git >>>>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>>>> index d0936d8..628deb7 100644 >>>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp >>>>> @@ -1141,13 +1141,14 @@ NVC0LoweringPass::handleATOM(Instruction >>>>> *atom) >>>>> handleSharedATOM(atom); >>>>> return true; >>>>> default: >>>>> - assert(atom->src(0).getFile() == FILE_MEMORY_GLOBAL); >>>>> + assert(atom->src(0).getFile() == FILE_MEMORY_BUFFER); >>>>> base = loadResInfo64(ind, atom->getSrc(0)->reg.fileIndex * >>>>> 16); >>>>> assert(base->reg.size == 8); >>>>> if (ptr) >>>>> base = bld.mkOp2v(OP_ADD, TYPE_U64, base, base, ptr); >>>>> assert(base->reg.size == 8); >>>>> atom->setIndirect(0, 0, base); >>>>> + atom->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; >>>>> return true; >>>>> } >>>>> base = >>>>> @@ -1963,7 +1964,7 @@ NVC0LoweringPass::visit(Instruction *i) >>>>> } else if (i->src(0).getFile() == FILE_SHADER_OUTPUT) { >>>>> assert(prog->getType() == >>>>> Program::TYPE_TESSELLATION_CONTROL); >>>>> i->op = OP_VFETCH; >>>>> - } else if (i->src(0).getFile() == FILE_MEMORY_GLOBAL) { >>>>> + } else if (i->src(0).getFile() == FILE_MEMORY_BUFFER) { >>>>> Value *ind = i->getIndirect(0, 1); >>>>> Value *ptr = loadResInfo64(ind, >>>>> i->getSrc(0)->reg.fileIndex * 16); >>>>> // XXX come up with a way not to do this for EVERY little >>>>> access but >>>>> @@ -1978,6 +1979,7 @@ NVC0LoweringPass::visit(Instruction *i) >>>>> } >>>>> i->setIndirect(0, 1, NULL); >>>>> i->setIndirect(0, 0, ptr); >>>>> + i->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL; >>>>> bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, >>>>> length); >>>>> i->setPredicate(CC_NOT_P, pred); >>>>> if (i->defExists(0)) { >>>>> @@ -1987,7 +1989,7 @@ NVC0LoweringPass::visit(Instruction *i) >>>>> break; >>>>> case OP_ATOM: >>>>> { >>>>> - const bool cctl = i->src(0).getFile() == FILE_MEMORY_GLOBAL; >>>>> + const bool cctl = i->src(0).getFile() == FILE_MEMORY_BUFFER; >>>>> handleATOM(i); >>>>> handleCasExch(i, cctl); >>>>> } >>>>> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>>>> index cfa85ec..870b36e 100644 >>>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp >>>>> @@ -455,6 +455,7 @@ int Symbol::print(char *buf, size_t size, >>>>> case FILE_MEMORY_CONST: c = 'c'; break; >>>>> case FILE_SHADER_INPUT: c = 'a'; break; >>>>> case FILE_SHADER_OUTPUT: c = 'o'; break; >>>>> + case FILE_MEMORY_BUFFER: c = 'b'; break; // Only used before >>>>> lowering >>>> >>>> Could you please show me the output of NV50_PROG_DEBUG=255 with a test >>>> which uses this file type? I'm not sure if using b[] is better than >>>> g[] actually. >>> >>> NV50_PROG_DEBUG=255 bin/arb_shader_storage_buffer_object-rendering >>> >>> ... >>> >>> MAIN:-1 () >>> BB:0 (52 instructions) - df = { } >>> -> BB:1 (tree) >>> 0: mov u32 %r1 0x00000000 (0) >>> 1: ld u32 %r0 b[0x0] (0) >>> 2: presin f32 %r3 %r0 (0) >>> 3: cos f32 %r3 %r3 (0) >>> 4: mov u32 %r2 %r3 (0) >>> ... >>> >>> And after the first lowering step: >>> >>> MAIN:-1 () >>> BB:0 (77 instructions) - df = { } >>> -> BB:1 (tree) >>> 0: mov u32 %r56 0x00000000 (0) >>> 1: ld u64 %r57d c15[0x300] (0) >>> 2: mov u32 %r58 0x00000004 (0) >>> 3: ld u32 %r59 c15[0x308] (0) >>> 4: set u8 %p60 gt u32 %r58 %r59 (0) >>> 5: mov u32 %r61 0x00000000 (0) >>> 6: not %p60 ld u32 %r62 g[%r57d+0x0] (0) >>> ... >>> >>> Note how the 'b' printing is only used before the buffer access >>> is lowered to a global access, so this seems to be the right thing todo. >>> >> >> Fine by me. >> Thanks. >> >>> Regards, >>> >>> Hans >>> >>> >>>> >>>>> case FILE_MEMORY_GLOBAL: c = 'g'; break; >>>>> case FILE_MEMORY_SHARED: c = 's'; break; >>>>> case FILE_MEMORY_LOCAL: c = 'l'; break; >>>>> diff --git >>>>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>>>> index 2c4d7f5..2af1715 100644 >>>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp >>>>> @@ -207,6 +207,7 @@ TargetNV50::getFileSize(DataFile file) const >>>>> case FILE_MEMORY_CONST: return 65536; >>>>> case FILE_SHADER_INPUT: return 0x200; >>>>> case FILE_SHADER_OUTPUT: return 0x200; >>>>> + case FILE_MEMORY_BUFFER: return 0xffffffff; >>>>> case FILE_MEMORY_GLOBAL: return 0xffffffff; >>>>> case FILE_MEMORY_SHARED: return 16 << 10; >>>>> case FILE_MEMORY_LOCAL: return 48 << 10; >>>>> @@ -406,7 +407,8 @@ TargetNV50::isAccessSupported(DataFile file, >>>>> DataType ty) const >>>>> if (ty == TYPE_B96 || ty == TYPE_NONE) >>>>> return false; >>>>> if (typeSizeof(ty) > 4) >>>>> - return (file == FILE_MEMORY_LOCAL) || (file == >>>>> FILE_MEMORY_GLOBAL); >>>>> + return (file == FILE_MEMORY_LOCAL) || (file == >>>>> FILE_MEMORY_GLOBAL) || >>>>> + (file == FILE_MEMORY_BUFFER); >>>>> return true; >>>>> } >>>>> >>>>> @@ -509,6 +511,7 @@ int TargetNV50::getLatency(const Instruction *i) >>>>> const >>>>> switch (i->src(0).getFile()) { >>>>> case FILE_MEMORY_LOCAL: >>>>> case FILE_MEMORY_GLOBAL: >>>>> + case FILE_MEMORY_BUFFER: >>>>> return 100; // really 400 to 800 >>>>> default: >>>>> return 22; >>>>> diff --git >>>>> a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>>>> b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>>>> index a03afa8..9e1e7bf 100644 >>>>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>>>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp >>>>> @@ -248,6 +248,7 @@ TargetNVC0::getFileSize(DataFile file) const >>>>> case FILE_MEMORY_CONST: return 65536; >>>>> case FILE_SHADER_INPUT: return 0x400; >>>>> case FILE_SHADER_OUTPUT: return 0x400; >>>>> + case FILE_MEMORY_BUFFER: return 0xffffffff; >>>>> case FILE_MEMORY_GLOBAL: return 0xffffffff; >>>>> case FILE_MEMORY_SHARED: return 16 << 10; >>>>> case FILE_MEMORY_LOCAL: return 48 << 10; >>>>> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <571019E1.2080102-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH mesa v2 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers [not found] ` <571019E1.2080102-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2016-04-20 11:48 ` Hans de Goede 0 siblings, 0 replies; 9+ messages in thread From: Hans de Goede @ 2016-04-20 11:48 UTC (permalink / raw) To: Samuel Pitoiset, Ilia Mirkin Cc: mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Hi, On 15-04-16 00:29, Samuel Pitoiset wrote: > > > On 04/12/2016 12:04 PM, Hans de Goede wrote: >> Hi, >> >> On 08-04-16 18:14, Samuel Pitoiset wrote: >>> >>> >>> On 04/08/2016 12:17 PM, Hans de Goede wrote: >>>> Hi, >>>> >>>> On 23-03-16 23:10, Samuel Pitoiset wrote: >>>>> Are you sure this won't break compute shaders on fermi? >>>>> Could you please double-check that? >>>> >>>> I just checked: >>>> >>>> lspci: >>>> 01:00.0 VGA compatible controller: NVIDIA Corporation GF119 [GeForce GT >>>> 610] (rev a1) >>>> >>>> Before this patch-set: >>>> >>>> [hans@plank piglit]$ ./piglit run -o shader -t >>>> '.*arb_shader_storage_buffer_object.*' results/shader >>>> [9/9] pass: 9 / >>>> >>>> After this patch-set: >>>> >>>> [hans@plank piglit]$ ./piglit run -o shader -t >>>> '.*arb_shader_storage_buffer_object.*' results/shader >>>> [9/9] pass: 9 / >>> >>> And what about compute shaders? (ie. -t arb_compute_shader) >>> Sorry to ask you again but I just want to be sure it's fine. :-) >> >> Those tests don't run yet on mesa master on the GF119 card >> I've: >> >> [hans@plank piglit]$ ./piglit run -o shader -t '.*arb_compute_shader.*' >> results/shader >> [20/20] skip: 20 | >> >> My patches don't change anything about this, and they only touch >> the buffer handling paths and the buffer tests (still) pass... >> >> I've also tried on a: >> 01:00.0 VGA compatible controller: NVIDIA Corporation GK107 [GeForce GT >> 740] (rev a1) >> >> Same result. > > Sorry for the delay, I was dealing with images. > > Well, you needed to override ARB_compute_shader because the extension is not currently exposed. > > For example: > MESA_EXTENSION_OVERRIDE=GL_ARB_compute_shader MESA_GL_VERSION_OVERRIDE=4.2 ./piglit-run.py blabla > > I tried myself to test your series but it no longer applies on top of master. Well, if you make a quick test with: > > MESA_EXTENSION_OVERRIDE=GL_ARB_compute_shader MESA_GL_VERSION_OVERRIDE=4.2 ./piglit-run.py -1 --dmesg -t arb_compute_shader > > that might be nice Done on both a gf119 and gk107, result on both: [hans@plank piglit]$ DISPLAY=:0 MESA_EXTENSION_OVERRIDE=GL_ARB_compute_shader MESA_GL_VERSION_OVERRIDE=4.2 ./piglit run -o shader -t '.*arb_compute_shader.*' results/shader [20/20] skip: 4, pass: 16 | Thank you for running Piglit! > but whatever, series is: > > Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Thanks, I've updated the commit msg with the results of the extra tests I've done and pushed these 2 patches to master. Regards, Hans _______________________________________________ Nouveau mailing list Nouveau@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/nouveau ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-04-20 11:48 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-17 16:07 [PATCH mesa v2 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers Hans de Goede
[not found] ` <1458230823-25213-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-03-17 16:07 ` [PATCH mesa v2 2/2] nouveau: codegen: Add support for OpenCL global memory buffers Hans de Goede
2016-03-21 11:26 ` [Mesa-dev, v2, 1/2] nouveau: codegen: Use FILE_MEMORY_BUFFER for buffers Hans de Goede
2016-03-23 22:10 ` [PATCH mesa v2 " Samuel Pitoiset
2016-04-08 10:17 ` Hans de Goede
[not found] ` <57078551.1080703-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-04-08 16:14 ` Samuel Pitoiset
[not found] ` <5707D8D7.8050403-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-04-12 10:04 ` Hans de Goede
2016-04-14 22:29 ` Samuel Pitoiset
[not found] ` <571019E1.2080102-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-04-20 11:48 ` Hans de Goede
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.