OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
1da51ec0f7120be5411568b8e8305d47e19673b8
third_party_mesa3d/src/compiler/glsl/ir_print_visitor.cpp

647 lines
16 KiB
C++
Raw Normal View History

IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
/*
* Copyright © 2010 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 stdio.h and stdlib.h everywhere, and don't cook our own #define NULL.
2010-06-22 10:38:52 -07:00
glsl: fix compile errors with mingw due to missing PRIx64 definitions define __STDC_FORMAT_MACROS and include <inttypes.h> (same as ir_builder_print_visitor.cpp already does). Otherwise, some mingw build errors out (since 8e7e1ae0365ddc7edb0d4d98250ab46728e6c14a and bbce1c538dc0cb8bf3769510283d11847dc07540 presumably) with: src/compiler/glsl/ir_print_visitor.cpp:479:40: error: expected ‘)’ before ‘PRIu64’ case GLSL_TYPE_UINT64:fprintf(f, "%" PRIu64, ir->value.u64[i]); break; (Note even with that fix I get other format specifier warnings: src/compiler/glsl/ir_print_visitor.cpp:473:47: warning: unknown conversion type character ‘a’ in format [-Wformat=] fprintf(f, "%a", ir->value.f[i]); ^ src/compiler/glsl/ir_print_visitor.cpp:473:47: warning: too many arguments for format [-Wformat-extra-args] but it still compiles at least) Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
2017-01-23 20:21:00 +01:00
#include <inttypes.h> /* for PRIx64 macro */
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
#include "ir_print_visitor.h"
nir: move glsl_types.{cpp,h} to compiler Allows us to remove the SCons workaround :-) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Matt Turner <mattst88@gmail.com> Acked-by: Jose Fonseca <jfonseca@vmware.com>
2016-01-18 11:35:29 +02:00
#include "compiler/glsl_types.h"
Track and print user defined structure types
2010-04-28 13:14:53 -07:00
#include "glsl_parser_extras.h"
glsl: Fix ir_print_visitor's handling of interpolation qualifiers. This patch updates the interp[] array to match the enum glsl_interp_qualifier. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> v2: Add a STATIC_ASSERT to make sure the array is the correct size. This required adding INTERP_QUALIFIER_COUNT to the enum.
2013-04-06 19:16:58 -07:00
#include "main/macros.h"
glsl: replace old hash table with new and faster one The util/hash_table was intended to be a fast hash table replacement for the program/hash_table see 35fd61bd99c1 and 72e55bb6888ff. Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
2015-08-03 02:15:20 +02:00
#include "util/hash_table.h"
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
static void print_type(FILE *f, const glsl_type *t);
IR print visitor: Add some support for printing types and constants
2010-03-09 21:44:34 -08:00
ir: Give ir_instruction a print visitor helper. This avoids spamming each file with includes of ir_print_visitor.h because someone was doing debugging at some point, and is less typing when doing debugging.
2010-06-22 12:09:21 -07:00
void
Add a virtual clone() method to ir_instruction. This will be used by function inlining, the linker, and avoiding double usage of the LHS deref chains in ++, *=, and similar operations.
2010-06-23 11:37:12 -07:00
ir_instruction::print(void) const
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
{
this->fprint(stdout);
}
void
ir_instruction::fprint(FILE *f) const
ir: Give ir_instruction a print visitor helper. This avoids spamming each file with includes of ir_print_visitor.h because someone was doing debugging at some point, and is less typing when doing debugging.
2010-06-22 12:09:21 -07:00
{
Add a virtual clone() method to ir_instruction. This will be used by function inlining, the linker, and avoiding double usage of the LHS deref chains in ++, *=, and similar operations.
2010-06-23 11:37:12 -07:00
ir_instruction *deconsted = const_cast<ir_instruction *>(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
ir_print_visitor v(f);
Add a virtual clone() method to ir_instruction. This will be used by function inlining, the linker, and avoiding double usage of the LHS deref chains in ++, *=, and similar operations.
2010-06-23 11:37:12 -07:00
deconsted->accept(&v);
ir: Give ir_instruction a print visitor helper. This avoids spamming each file with includes of ir_print_visitor.h because someone was doing debugging at some point, and is less typing when doing debugging.
2010-06-22 12:09:21 -07:00
}
glsl: Make _mesa_print_ir() available from anything including ir.h. No more forgetting to #include "ir_print_visitor.h" when doing temporary debug code, or forgetting and leaving it in after removing your temporary debug code. Also, available from C code so you don't need to move the caller to C++ just to call it (see also: ir_to_mesa.cpp). Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2013-06-12 16:10:33 -07:00
extern "C" {
IR print visitor: Move logic for printing the whole program to _mesa_print_ir
2010-04-28 13:04:15 -07:00
void
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
_mesa_print_ir(FILE *f, exec_list *instructions,
IR print visitor: Move logic for printing the whole program to _mesa_print_ir
2010-04-28 13:04:15 -07:00
struct _mesa_glsl_parse_state *state)
{
glsl2: Allow use of _mesa_print_ir without a parse state on hand.
2010-07-29 15:04:45 -07:00
if (state) {
for (unsigned i = 0; i < state->num_user_structures; i++) {
const glsl_type *const s = state->user_structures[i];
Track and print user defined structure types
2010-04-28 13:14:53 -07:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(structure (%s) (%s@%p) (%u) (\n",
s->name, s->name, (void *) s, s->length);
Track and print user defined structure types
2010-04-28 13:14:53 -07:00
glsl2: Allow use of _mesa_print_ir without a parse state on hand.
2010-07-29 15:04:45 -07:00
for (unsigned j = 0; j < s->length; j++) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "\t((");
print_type(f, s->fields.structure[j].type);
fprintf(f, ")(%s))\n", s->fields.structure[j].name);
glsl2: Allow use of _mesa_print_ir without a parse state on hand.
2010-07-29 15:04:45 -07:00
}
Track and print user defined structure types
2010-04-28 13:14:53 -07:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")\n");
glsl2: Allow use of _mesa_print_ir without a parse state on hand.
2010-07-29 15:04:45 -07:00
}
Track and print user defined structure types
2010-04-28 13:14:53 -07:00
}
IR print visitor: Move logic for printing the whole program to _mesa_print_ir
2010-04-28 13:04:15 -07:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(\n");
glsl: Use typed foreach_in_list instead of foreach_list. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-24 21:34:05 -07:00
foreach_in_list(ir_instruction, ir, instructions) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
ir->fprint(f);
glsl2: When dumping IR for debug, skip all the empty builtin prototypes.
2010-07-29 14:20:39 -07:00
if (ir->ir_type != ir_type_function)
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "\n");
IR print visitor: Move logic for printing the whole program to _mesa_print_ir
2010-04-28 13:04:15 -07:00
}
glsl: fix formatting glitch in _mesa_print_ir() Print the closing ) before the newline. Trivial.
2015-06-19 16:45:44 -06:00
fprintf(f, ")\n");
IR print visitor: Move logic for printing the whole program to _mesa_print_ir
2010-04-28 13:04:15 -07:00
}
glsl: Add C-callable fprint_ir function. Acked-by: Eric Anholt <eric@anholt.net> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2014-05-12 18:16:22 -07:00
void
fprint_ir(FILE *f, const void *instruction)
{
const ir_instruction *ir = (const ir_instruction *)instruction;
ir->fprint(f);
}
glsl: Make _mesa_print_ir() available from anything including ir.h. No more forgetting to #include "ir_print_visitor.h" when doing temporary debug code, or forgetting and leaving it in after removing your temporary debug code. Also, available from C code so you don't need to move the caller to C++ just to call it (see also: ir_to_mesa.cpp). Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2013-06-12 16:10:33 -07:00
} /* extern "C" */
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
ir_print_visitor::ir_print_visitor(FILE *f)
: f(f)
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
{
indentation = 0;
printable_names =
glsl: replace old hash table with new and faster one The util/hash_table was intended to be a fast hash table replacement for the program/hash_table see 35fd61bd99c1 and 72e55bb6888ff. Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
2015-08-03 02:15:20 +02:00
_mesa_hash_table_create(NULL, _mesa_hash_pointer, _mesa_key_pointer_equal);
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
symbols = _mesa_symbol_table_ctor();
mem_ctx = ralloc_context(NULL);
}
ir_print_visitor::~ir_print_visitor()
{
glsl: replace old hash table with new and faster one The util/hash_table was intended to be a fast hash table replacement for the program/hash_table see 35fd61bd99c1 and 72e55bb6888ff. Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
2015-08-03 02:15:20 +02:00
_mesa_hash_table_destroy(printable_names, NULL);
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
_mesa_symbol_table_dtor(symbols);
ralloc_free(mem_ctx);
}
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
void ir_print_visitor::indent(void)
{
for (int i = 0; i < indentation; i++)
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
}
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
const char *
ir_print_visitor::unique_name(ir_variable *var)
{
glsl: Don't choke when printing an anonymous function parameter NOTE: This is a candidate for the 7.10 and 7.11 branches. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38584 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-06-24 17:30:41 -07:00
/* var->name can be NULL in function prototypes when a type is given for a
* parameter but no name is given. In that case, just return an empty
* string. Don't worry about tracking the generated name in the printable
* names hash because this is the only scope where it can ever appear.
*/
if (var->name == NULL) {
static unsigned arg = 1;
return ralloc_asprintf(this->mem_ctx, "parameter@%u", arg++);
}
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
/* Do we already have a name for this variable? */
glsl: replace old hash table with new and faster one The util/hash_table was intended to be a fast hash table replacement for the program/hash_table see 35fd61bd99c1 and 72e55bb6888ff. Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
2015-08-03 02:15:20 +02:00
struct hash_entry * entry =
_mesa_hash_table_search(this->printable_names, var);
if (entry != NULL) {
return (const char *) entry->data;
}
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
/* If there's no conflict, just use the original name */
glsl: replace old hash table with new and faster one The util/hash_table was intended to be a fast hash table replacement for the program/hash_table see 35fd61bd99c1 and 72e55bb6888ff. Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
2015-08-03 02:15:20 +02:00
const char* name = NULL;
glsl/mesa: remove unused namespace support from the symbol table Namespace support seems to have been unused for a very long time. Previously the hash table entry was never removed and the symbol name wasn't freed until the symbol table was destroyed. In theory this could reduced the number of times we need to copy a string as duplicate names are reused. However in practice there is likely only a limited number of symbols that are the same and this is likely to cause other less than optimal behaviour such as the hash_table continuously growing. Along with dropping namespace support this change removes entries from the hash table as they become unused. Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
2016-10-21 16:50:52 +11:00
if (_mesa_symbol_table_find_symbol(this->symbols, var->name) == NULL) {
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
name = var->name;
} else {
static unsigned i = 1;
name = ralloc_asprintf(this->mem_ctx, "%s@%u", var->name, ++i);
}
glsl: replace old hash table with new and faster one The util/hash_table was intended to be a fast hash table replacement for the program/hash_table see 35fd61bd99c1 and 72e55bb6888ff. Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
2015-08-03 02:15:20 +02:00
_mesa_hash_table_insert(this->printable_names, var, (void *) name);
glsl/mesa: remove unused namespace support from the symbol table Namespace support seems to have been unused for a very long time. Previously the hash table entry was never removed and the symbol name wasn't freed until the symbol table was destroyed. In theory this could reduced the number of times we need to copy a string as duplicate names are reused. However in practice there is likely only a limited number of symbols that are the same and this is likely to cause other less than optimal behaviour such as the hash_table continuously growing. Along with dropping namespace support this change removes entries from the hash table as they become unused. Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
2016-10-21 16:50:52 +11:00
_mesa_symbol_table_add_symbol(this->symbols, name, var);
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
return name;
}
IR print visitor: Add some support for printing types and constants
2010-03-09 21:44:34 -08:00
static void
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
print_type(FILE *f, const glsl_type *t)
IR print visitor: Add some support for printing types and constants
2010-03-09 21:44:34 -08:00
{
glsl: make use of glsl_type::is_array() Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com> Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
2017-04-21 10:25:42 +02:00
if (t->is_array()) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(array ");
print_type(f, t->fields.array);
fprintf(f, " %u)", t->length);
glsl: make use of glsl_type::is_record() Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com> Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
2017-04-21 10:32:39 +02:00
} else if (t->is_record() && !is_gl_identifier(t->name)) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "%s@%p", t->name, (void *) t);
IR print visitor: Add some support for printing types and constants
2010-03-09 21:44:34 -08:00
} else {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "%s", t->name);
IR print visitor: Add some support for printing types and constants
2010-03-09 21:44:34 -08:00
}
}
glsl: Clean up "unused parameter" warnings ../../src/glsl/builtin_functions.cpp:72:1: warning: unused parameter 'state' [-Wunused-parameter] ../../src/glsl/ir_clone.cpp:31:1: warning: unused parameter 'ht' [-Wunused-parameter] ../../src/glsl/ir_equals.cpp:44:1: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/ir_equals.cpp:50:1: warning: unused parameter 'ignore' [-Wunused-parameter] ../../src/glsl/ir_equals.cpp:68:1: warning: unused parameter 'ignore' [-Wunused-parameter] ../../src/glsl/ir_print_visitor.cpp:149:6: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/ir_print_visitor.cpp:556:1: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/ir_print_visitor.cpp:562:1: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/link_uniforms.cpp:213:1: warning: unused parameter 'record_type' [-Wunused-parameter] ../../src/glsl/loop_analysis.cpp:225:1: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/loop_unroll.cpp:73:30: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/loop_unroll.cpp:79:30: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/loop_unroll.cpp:85:30: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/opt_copy_propagation_elements.cpp:189:1: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/opt_cse.cpp:402:1: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/opt_dead_code_local.cpp:117:30: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/opt_redundant_jumps.cpp:53:1: warning: unused parameter 'ir' [-Wunused-parameter] ../../src/glsl/opt_vectorize.cpp:301:1: warning: unused parameter 'ir' [-Wunused-parameter] Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2014-03-27 14:17:53 -07:00
void ir_print_visitor::visit(ir_rvalue *)
glsl: Use ir_rvalue to represent generic error_type values. Currently, ir_call can be used as either a statement (for void functions) or a value (for non-void functions). This is rather awkward, as it's the only class that can be used in both forms. A number of places use ir_call::get_error_instruction() to construct a generic value of error_type. If ir_call is to become a statement, it can no longer serve this purpose. Unfortunately, none of our classes are particularly well suited for this, and creating a new one would be rather aggrandizing. So, this patch introduces ir_rvalue::error_value(), a static method that creates an instance of the base class, ir_rvalue. This has the nice property that you can't accidentally try and access uninitialized fields (as it doesn't have any). The downside is that the base class is no longer abstract. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-09-22 15:04:56 -07:00
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "error");
glsl: Use ir_rvalue to represent generic error_type values. Currently, ir_call can be used as either a statement (for void functions) or a value (for non-void functions). This is rather awkward, as it's the only class that can be used in both forms. A number of places use ir_call::get_error_instruction() to construct a generic value of error_type. If ir_call is to become a statement, it can no longer serve this purpose. Unfortunately, none of our classes are particularly well suited for this, and creating a new one would be rather aggrandizing. So, this patch introduces ir_rvalue::error_value(), a static method that creates an instance of the base class, ir_rvalue. This has the nice property that you can't accidentally try and access uninitialized fields (as it doesn't have any). The downside is that the base class is no longer abstract. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-09-22 15:04:56 -07:00
}
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
void ir_print_visitor::visit(ir_variable *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(declare ");
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
glsl: print non-zero bindings of variables Reviewed-by: Marek Olšák <marek.olsak@amd.com>
2016-10-13 15:27:00 +02:00
char binding[32] = {0};
if (ir->data.binding)
snprintf(binding, sizeof(binding), "binding=%i ", ir->data.binding);
glsl: dump explicit location when printing IR Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net> Reviewed-by: Dave Airlie <airlied@redhat.com>
2016-10-06 23:10:10 +02:00
char loc[32] = {0};
glsl: print locations of variables Reviewed-by: Brian Paul <brianp@vmware.com>
2015-03-19 23:28:25 +01:00
if (ir->data.location != -1)
snprintf(loc, sizeof(loc), "location=%i ", ir->data.location);
glsl: dump explicit location when printing IR Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net> Reviewed-by: Dave Airlie <airlied@redhat.com>
2016-10-06 23:10:10 +02:00
char component[32] = {0};
if (ir->data.explicit_component)
snprintf(component, sizeof(component), "component=%i ", ir->data.location_frac);
glsl: remember per-component vertex streams for packed varyings Reviewed-by: Marek Olšák <marek.olsak@amd.com>
2016-11-30 10:38:55 +01:00
char stream[32] = {0};
if (ir->data.stream & (1u << 31)) {
if (ir->data.stream & ~(1u << 31)) {
snprintf(stream, sizeof(stream), "stream(%u,%u,%u,%u) ",
ir->data.stream & 3, (ir->data.stream >> 2) & 3,
(ir->data.stream >> 4) & 3, (ir->data.stream >> 6) & 3);
}
} else if (ir->data.stream) {
snprintf(stream, sizeof(stream), "stream%u ", ir->data.stream);
}
glsl: include image qualifiers when printing IR v2: - fix copy&paste errors noted by Samuel - rebase Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
2017-04-26 18:34:09 +02:00
char image_format[32] = {0};
if (ir->data.image_format) {
snprintf(image_format, sizeof(image_format), "format=%x ",
ir->data.image_format);
}
glsl: introduce data section to ir_variable Data section helps serialization and cloning of a ir_variable. This patch includes the helper bits used for read only ir_variables. Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2013-12-12 12:57:57 +02:00
const char *const cent = (ir->data.centroid) ? "centroid " : "";
const char *const samp = (ir->data.sample) ? "sample " : "";
glsl: add the patch in/out qualifier (v2) v2: Dropped some unrelated reordering in glsl_parser.yy as Ken suggested. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2014-03-05 13:43:17 +01:00
const char *const patc = (ir->data.patch) ? "patch " : "";
glsl: introduce data section to ir_variable Data section helps serialization and cloning of a ir_variable. This patch includes the helper bits used for read only ir_variables. Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2013-12-12 12:57:57 +02:00
const char *const inv = (ir->data.invariant) ? "invariant " : "";
glsl: Print "precise" on ir_variable nodes. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
2016-04-03 01:25:03 -07:00
const char *const prec = (ir->data.precise) ? "precise " : "";
glsl: process bindless/bound layout qualifiers This adds bindless_sampler and bound_sampler (and respectively bindless_image and bound_image) to the parser. v3: - add an extra space in apply_bindless_qualifier_to_variable() - fix indentation in merge_qualifier() Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-03-21 13:30:49 +01:00
const char *const bindless = (ir->data.bindless) ? "bindless " : "";
const char *const bound = (ir->data.bound) ? "bound " : "";
glsl: include image qualifiers when printing IR v2: - fix copy&paste errors noted by Samuel - rebase Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
2017-04-26 18:34:09 +02:00
const char *const memory_read_only = (ir->data.memory_read_only) ? "readonly " : "";
const char *const memory_write_only = (ir->data.memory_write_only) ? "writeonly " : "";
const char *const memory_coherent = (ir->data.memory_coherent) ? "coherent " : "";
const char *const memory_volatile = (ir->data.memory_volatile) ? "volatile " : "";
const char *const memory_restrict = (ir->data.memory_restrict) ? "restrict " : "";
glsl: Add space to shader_storage in print_visitor Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
2015-11-08 19:07:43 -08:00
const char *const mode[] = { "", "uniform ", "shader_storage ",
glsl: Add shared variable type Shared variables are stored in a common pool accessible by all threads in a compute shader local work group. These variables are similar to OpenCL's local/__local variables. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
2015-07-28 14:56:49 -07:00
"shader_shared ", "shader_in ", "shader_out ",
glsl: Eliminate ambiguity between function ins/outs and shader ins/outs This patch replaces the three ir_variable_mode enums: - ir_var_in - ir_var_out - ir_var_inout with the following five: - ir_var_shader_in - ir_var_shader_out - ir_var_function_in - ir_var_function_out - ir_var_function_inout This eliminates a frustrating ambiguity: it used to be impossible to tell whether an ir_var_{in,out} variable was a shader in/out or a function in/out without seeing where the variable was declared in the IR. This complicated some optimization and lowering passes, and would have become a problem for implementing varying structs. In the lisp-style serialization of GLSL IR to strings performed by ir_print_visitor.cpp and ir_reader.cpp, I've retained the names "in", "out", and "inout" for function parameters, to avoid introducing code churn to the src/glsl/builtins/ir/ directory. Note: a couple of comments in the code seemed to indicate that we were planning for a possible future in which geometry shaders could have shader-scope inout variables. Our GLSL grammar rejects shader-scope inout variables, and I've been unable to find any evidence in the GLSL standards documents (or extensions) that this will ever be allowed, so I've eliminated these comments. Reviewed-by: Carl Worth <cworth@cworth.org> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-01-11 14:39:32 -08:00
"in ", "out ", "inout ",
glsl: Introduce a new "const_in" variable mode. This annotation is for an "in" function parameter for which it is only legal to pass constant expressions. The only known example of this, currently, is the textureOffset functions. This should never be used for globals.
2011-01-12 15:37:37 -08:00
"const_in ", "sys ", "temporary " };
glsl: Check the size of ir_print_visitor's mode[] array with STATIC_ASSERT. ir_print_visitor::visit(ir_variable *)'s mode[] array needs to match the declaration of the enum ir_variable_mode. It's hard to verify that at compile time, but at least we can use a STATIC_ASSERT to make sure it's the right size. This required adding ir_var_mode_count to the enum.
2013-04-09 10:03:11 -07:00
STATIC_ASSERT(ARRAY_SIZE(mode) == ir_var_mode_count);
glsl: Fix ir_print_visitor's handling of interpolation qualifiers. This patch updates the interp[] array to match the enum glsl_interp_qualifier. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> v2: Add a STATIC_ASSERT to make sure the array is the correct size. This required adding INTERP_QUALIFIER_COUNT to the enum.
2013-04-06 19:16:58 -07:00
const char *const interp[] = { "", "smooth", "flat", "noperspective" };
compiler: Rename INTERP_QUALIFIER_* to INTERP_MODE_*. Likewise, rename the enum type to glsl_interp_mode. Beyond the GLSL front-end, talking about "interpolation modes" seems more natural than "interpolation qualifiers" - in the IR, we're removed from how exactly the source language specifies how to interpolate an input. Also, SPIR-V calls these "decorations" rather than "qualifiers". Generated by: $ find . -regextype egrep -regex '.*\.(c|cpp|h)' -type f -exec sed -i \ -e 's/INTERP_QUALIFIER_/INTERP_MODE_/g' \ -e 's/glsl_interp_qualifier/glsl_interp_mode/g' {} \; Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Dave Airlie <airlied@redhat.com>
2016-07-07 02:02:38 -07:00
STATIC_ASSERT(ARRAY_SIZE(interp) == INTERP_MODE_COUNT);
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
glsl: include image qualifiers when printing IR v2: - fix copy&paste errors noted by Samuel - rebase Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
2017-04-26 18:34:09 +02:00
fprintf(f, "(%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s) ",
binding, loc, component, cent, bindless, bound,
image_format, memory_read_only, memory_write_only,
memory_coherent, memory_volatile, memory_restrict,
samp, patc, inv, prec, mode[ir->data.mode],
stream,
glsl: include streamId when reading/printing ir_variable IR. Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-10 08:45:44 +02:00
interp[ir->data.interpolation]);
IR print visitor: Add some support for printing types and constants
2010-03-09 21:44:34 -08:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
print_type(f, ir->type);
fprintf(f, " %s)", unique_name(ir));
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
}
void ir_print_visitor::visit(ir_function_signature *ir)
{
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
_mesa_symbol_table_push_scope(symbols);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(signature ");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation++;
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
print_type(f, ir->return_type);
fprintf(f, "\n");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(parameters\n");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation++;
glsl: Use typed foreach_in_list instead of foreach_list. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-24 21:34:05 -07:00
foreach_in_list(ir_variable, inst, &ir->parameters) {
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
Make function bodies rely on the parameter variable declarations. Previously, generating inlined function bodies was going to be difficult, as there was no mapping between the body's declaration of variables where parameter values were supposed to live and the parameter variables that a caller would use in paramater setup. Presumably this also have been a problem for actual codegen.
2010-04-07 14:32:53 -07:00
inst->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "\n");
Make function bodies rely on the parameter variable declarations. Previously, generating inlined function bodies was going to be difficult, as there was no mapping between the body's declaration of variables where parameter values were supposed to live and the parameter variables that a caller would use in paramater setup. Presumably this also have been a problem for actual codegen.
2010-04-07 14:32:53 -07:00
}
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation--;
indent();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")\n");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(\n");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation++;
Make function bodies rely on the parameter variable declarations. Previously, generating inlined function bodies was going to be difficult, as there was no mapping between the body's declaration of variables where parameter values were supposed to live and the parameter variables that a caller would use in paramater setup. Presumably this also have been a problem for actual codegen.
2010-04-07 14:32:53 -07:00
glsl: Use typed foreach_in_list instead of foreach_list. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-24 21:34:05 -07:00
foreach_in_list(ir_instruction, inst, &ir->body) {
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
Put function bodies under function signatures, instead of flat in the parent. This will let us know the length of function bodies for the purpose of inlining (among other uses).
2010-04-07 13:19:11 -07:00
inst->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "\n");
Put function bodies under function signatures, instead of flat in the parent. This will let us know the length of function bodies for the purpose of inlining (among other uses).
2010-04-07 13:19:11 -07:00
}
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation--;
indent();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "))\n");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation--;
glsl: Generate readable unique names at print time. Since GLSL IR allows multiple ir_variables to share the same name, we need to generate unique names when printing the IR. Previously, we always used %s@%p, appending the ir_variable's memory address. While this worked, it had two drawbacks: - When there aren't duplicates, the extra "@0x669a3e88" is useless and makes the code harder to read. - Real duplicates were hard to tell apart: channel_expressions@0x6699e3c8 vs. channel_expressions@0x6699ddd8 We now append @2, @3, @4, and so on, but only where necessary to distinguish duplicates. Since we only do this at print time, any performance impact is irrelevant. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <idr@freedesktop.org>
2011-03-25 10:59:46 -07:00
_mesa_symbol_table_pop_scope(symbols);
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
}
void ir_print_visitor::visit(ir_function *ir)
{
glsl/ir: add subroutine information storage to ir_function (v1.1) We need to store two sets of info into the ir_function, if this is a function definition with a subroutine list (subroutine_def) or if it a subroutine prototype. v1.1: add some more documentation. Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> Signed-off-by: Dave Airlie <airlied@redhat.com>
2015-04-20 10:22:57 +10:00
fprintf(f, "(%s function %s\n", ir->is_subroutine ? "subroutine" : "", ir->name);
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation++;
glsl: Use typed foreach_in_list instead of foreach_list. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-24 21:34:05 -07:00
foreach_in_list(ir_function_signature, sig, &ir->signatures) {
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
Refactor IR function representation. Now, ir_function is emitted as part of the IR instructions, rather than simply existing in the symbol table. Individual ir_function_signatures are not emitted themselves, but only as part of ir_function.
2010-04-21 12:30:22 -07:00
sig->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "\n");
Refactor IR function representation. Now, ir_function is emitted as part of the IR instructions, rather than simply existing in the symbol table. Individual ir_function_signatures are not emitted themselves, but only as part of ir_function.
2010-04-21 12:30:22 -07:00
}
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation--;
indent();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")\n\n");
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
}
void ir_print_visitor::visit(ir_expression *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(expression ");
IR print visitor: print expressions Not quite complete. The operator is not yet printed.
2010-03-25 18:25:37 -07:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
print_type(f, ir->type);
ir_print_visitor: print the type of expressions. This can be useful for debugging - it allows us to see that the inferred type is what we think it should be. Furthermore, it will allow the IR reader to avoid complex, operator-specific type inference.
2010-04-07 16:36:32 -07:00
glsl: Just access the ir_expression_operation strings table directly The operator_string functions gave us some protection against a malformed table. Now that the table is generated from the same data that generates the enum, this is not a concern. Just cut out the middle man. text data bss dec hex filename 7531892 273992 28584 7834468 778b64 i965_dri-64bit-before.so 7531828 273992 28584 7834404 778b24 i965_dri-64bit-after.so Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2015-04-15 17:55:32 -07:00
fprintf(f, " %s ", ir_expression_operation_strings[ir->operation]);
ir_print_visitor: print the type of expressions. This can be useful for debugging - it allows us to see that the inferred type is what we think it should be. Furthermore, it will allow the IR reader to avoid complex, operator-specific type inference.
2010-04-07 16:36:32 -07:00
glsl: Eliminate assumptions about size of ir_expression::operands This may grow in the near future.
2010-11-10 16:33:10 -08:00
for (unsigned i = 0; i < ir->get_num_operands(); i++) {
ir->operands[i]->accept(this);
}
IR print visitor: print expressions Not quite complete. The operator is not yet printed.
2010-03-25 18:25:37 -07:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ") ");
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
}
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
void ir_print_visitor::visit(ir_texture *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(%s ", ir->opcode_string());
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
glsl: Add ir_samples_identical opcode Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
2015-11-17 16:54:31 -08:00
if (ir->op == ir_samples_identical) {
ir->sampler->accept(this);
fprintf(f, " ");
ir->coordinate->accept(this);
fprintf(f, ")");
return;
}
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
print_type(f, ir->type);
fprintf(f, " ");
glsl: Explicitly specify a type when reading/printing ir_texture. This is necessary for GLSL 1.30+ shadow sampling functions, which return a single float rather than splatting the value to a vec4 based on GL_DEPTH_TEXTURE_MODE.
2011-02-25 14:29:36 -08:00
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
ir->sampler->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
glsl: add ir_texture_samples texture opcode Will be used for textureSamples() Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2015-08-27 23:03:46 -04:00
if (ir->op != ir_txs && ir->op != ir_query_levels &&
ir->op != ir_texture_samples) {
glsl: Add a new ir_txs (textureSize) opcode to ir_texture. One unique aspect of TXS is that it doesn't have a coordinate. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
2011-02-25 14:45:33 -08:00
ir->coordinate->accept(this);
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
glsl: Change texel offsets to a single vector rvalue. Having these as actual integer values makes it difficult to implement the texture*Offset built-in functions, since the offset is actually a function parameter (which doesn't have a constant value). The original rationale was that some hardware needs these offset baked into the instruction opcode. However, at least i965 should be able to support non-constant offsets. Others should be able to rely on inlining and constant propagation.
2011-01-08 23:49:23 -08:00
glsl: Add a new ir_txs (textureSize) opcode to ir_texture. One unique aspect of TXS is that it doesn't have a coordinate. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
2011-02-25 14:45:33 -08:00
if (ir->offset != NULL) {
ir->offset->accept(this);
} else {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "0");
glsl: Add a new ir_txs (textureSize) opcode to ir_texture. One unique aspect of TXS is that it doesn't have a coordinate. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
2011-02-25 14:45:33 -08:00
}
glsl: Change texel offsets to a single vector rvalue. Having these as actual integer values makes it difficult to implement the texture*Offset built-in functions, since the offset is actually a function parameter (which doesn't have a constant value). The original rationale was that some hardware needs these offset baked into the instruction opcode. However, at least i965 should be able to support non-constant offsets. Others should be able to rely on inlining and constant propagation.
2011-01-08 23:49:23 -08:00
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
glsl: Add a new ir_txs (textureSize) opcode to ir_texture. One unique aspect of TXS is that it doesn't have a coordinate. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
2011-02-25 14:45:33 -08:00
}
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
glsl: add plumbing for GL_ARB_texture_query_levels Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-09-26 19:37:30 +12:00
if (ir->op != ir_txf && ir->op != ir_txf_ms &&
ir->op != ir_txs && ir->op != ir_tg4 &&
glsl: add ir_texture_samples texture opcode Will be used for textureSamples() Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2015-08-27 23:03:46 -04:00
ir->op != ir_query_levels && ir->op != ir_texture_samples) {
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
if (ir->projector)
ir->projector->accept(this);
else
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "1");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
treewide: s/comparitor/comparator/ git grep -l comparitor | xargs sed -i 's/comparitor/comparator/g' Just happened to notice this in a patch that was sent and included one of the tokens in question. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Acked-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2016-12-12 08:32:38 -05:00
if (ir->shadow_comparator) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
treewide: s/comparitor/comparator/ git grep -l comparitor | xargs sed -i 's/comparitor/comparator/g' Just happened to notice this in a patch that was sent and included one of the tokens in question. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Acked-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2016-12-12 08:32:38 -05:00
ir->shadow_comparator->accept(this);
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
} else {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ()");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
}
}
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
switch (ir->op)
{
case ir_tex:
glsl: Implement ARB_texture_query_lod v2 [mattst88]: - Rebase. - #define GL_ARB_texture_query_lod to 1. - Remove comma after ir_lod in ir.h for MSVC. - Handled ir_lod in ir_hv_accept.cpp, ir_rvalue_visitor.cpp, opt_tree_grafting.cpp. - Rename textureQueryLOD to textureQueryLod, see https://www.khronos.org/bugzilla/show_bug.cgi?id=821 - Fix ir_reader of (lod ...). v3 [mattst88]: - Rename textureQueryLod to textureQueryLOD, pending resolution of Khronos 821. - Add ir_lod case to ir_to_mesa.cpp. Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-09-23 19:50:41 +10:00
case ir_lod:
glsl: add plumbing for GL_ARB_texture_query_levels Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-09-26 19:37:30 +12:00
case ir_query_levels:
glsl: add ir_texture_samples texture opcode Will be used for textureSamples() Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2015-08-27 23:03:46 -04:00
case ir_texture_samples:
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
break;
case ir_txb:
ir->lod_info.bias->accept(this);
break;
case ir_txl:
case ir_txf:
glsl: Add a new ir_txs (textureSize) opcode to ir_texture. One unique aspect of TXS is that it doesn't have a coordinate. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
2011-02-25 14:45:33 -08:00
case ir_txs:
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
ir->lod_info.lod->accept(this);
break;
glsl: add support for ARB_texture_multisample V2: - emit `sample` parameter properly for multisample texelFetch() - fix spurious whitespace change - introduce a new opcode ir_txf_ms rather than overloading the existing ir_txf further. This makes doing the right thing in the driver somewhat simpler. V3: - fix weird whitespace V4: - don't forget to include the new opcode in tex_opcode_strs[] (thanks Kenneth for spotting this) Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> [V2] Reviewed-by: Eric Anholt <eric@anholt.net> [V2] Reviewed-by: Paul Berry <stereotype441@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-12-21 21:33:37 +13:00
case ir_txf_ms:
ir->lod_info.sample_index->accept(this);
break;
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
case ir_txd:
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
ir->lod_info.grad.dPdx->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
ir->lod_info.grad.dPdy->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
break;
glsl: Add support for specifying the component in textureGather ARB_gpu_shader5 introduces new variants of textureGather* which have an explicit component selector, rather than relying purely on the sampler's swizzle state. This patch adds the GLSL plumbing for the extra parameter. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-10-05 18:26:56 +13:00
case ir_tg4:
ir->lod_info.component->accept(this);
break;
glsl: Add ir_samples_identical opcode Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
2015-11-17 16:54:31 -08:00
case ir_samples_identical:
glsl: fix unreachable() typo Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
2016-08-30 11:36:01 +01:00
unreachable("ir_samples_identical was already handled");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
};
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")");
ir_print_visitor: Add support for ir_texture.
2010-05-26 15:15:31 -07:00
}
Move swizzles out of ir_dereference and into their own class. Also turn generate_swizzle into a static "create" method of the new class; we'll want to use it for the IR reader as well. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-26 01:20:08 -07:00
void ir_print_visitor::visit(ir_swizzle *ir)
{
const unsigned swiz[4] = {
ir->mask.x,
ir->mask.y,
ir->mask.z,
ir->mask.w,
};
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(swiz ");
Move swizzles out of ir_dereference and into their own class. Also turn generate_swizzle into a static "create" method of the new class; we'll want to use it for the IR reader as well. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-26 01:20:08 -07:00
for (unsigned i = 0; i < ir->mask.num_components; i++) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "%c", "xyzw"[swiz[i]]);
Move swizzles out of ir_dereference and into their own class. Also turn generate_swizzle into a static "create" method of the new class; we'll want to use it for the IR reader as well. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-26 01:20:08 -07:00
}
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
Move swizzles out of ir_dereference and into their own class. Also turn generate_swizzle into a static "create" method of the new class; we'll want to use it for the IR reader as well. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-26 01:20:08 -07:00
ir->val->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")");
Move swizzles out of ir_dereference and into their own class. Also turn generate_swizzle into a static "create" method of the new class; we'll want to use it for the IR reader as well. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-26 01:20:08 -07:00
}
Refactor ir_dereference support for ir_visitor Move the accept method for visitors from ir_dereference to the derived classes.
2010-05-19 13:20:12 +02:00
void ir_print_visitor::visit(ir_dereference_variable *ir)
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
{
Attach a pointer to variable names in LIR dumping. Since variable names are not unique, and we like to make lots of __retvals and assignment_tmps and a,b,c,d this helps in debugging.
2010-06-24 09:07:38 -07:00
ir_variable *var = ir->variable_referenced();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(var_ref %s) ", unique_name(var));
Refactor ir_dereference support for ir_visitor Move the accept method for visitors from ir_dereference to the derived classes.
2010-05-19 13:20:12 +02:00
}
IR print visitor: print ir_dereference instructions Also make a slight change to ir_variable. The ir_dereference tracks the number of nested dereferences. If an ir_variable is visited and the count is non-zero, just print the name of the variable.
2010-03-25 17:38:13 -07:00
Refactor ir_dereference support for ir_visitor Move the accept method for visitors from ir_dereference to the derived classes.
2010-05-19 13:20:12 +02:00
void ir_print_visitor::visit(ir_dereference_array *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(array_ref ");
Refactor ir_dereference data fields to subclasses
2010-05-19 13:52:29 +02:00
ir->array->accept(this);
ir->array_index->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ") ");
Refactor ir_dereference support for ir_visitor Move the accept method for visitors from ir_dereference to the derived classes.
2010-05-19 13:20:12 +02:00
}
void ir_print_visitor::visit(ir_dereference_record *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(record_ref ");
Refactor ir_dereference data fields to subclasses
2010-05-19 13:52:29 +02:00
ir->record->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " %s) ", ir->field);
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
}
void ir_print_visitor::visit(ir_assignment *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(assign ");
IR print visitor: Print assignments
2010-03-09 16:40:45 -08:00
if (ir->condition)
ir->condition->accept(this);
glsl2: Add ir_assignment::write_mask and associated methods Replace swizzles on the LHS with additional swizzles on the RHS and a write mask in the assignment instruction. As part of this add ir_assignment::set_lhs. Ideally we'd make ir_assignment::lhs private to prevent erroneous writes, but that would require a lot of code butchery at this point. Add ir_assignment constructor that takes an explicit write mask. This is required for ir_assignment::clone, but it can also be used in other places. Without this, ir_assignment clones lose their write masks, and incorrect IR is generated in optimization passes. Add ir_assignment::whole_variable_written method. This method gets the variable on the LHS if the whole variable is written or NULL otherwise. This is different from ir->lhs->whole_variable_referenced() because the latter has no knowledge of the write mask stored in the ir_assignment. Gut all code from ir_to_mesa that handled swizzles on the LHS of assignments. There is probably some other refactoring that could be done here, but that can be left for another day.
2010-08-02 18:48:25 -07:00
char mask[5];
unsigned j = 0;
for (unsigned i = 0; i < 4; i++) {
if ((ir->write_mask & (1 << i)) != 0) {
mask[j] = "xyzw"[i];
j++;
}
}
mask[j] = '\0';
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " (%s) ", mask);
IR print visitor: Remove most of the newlines from the printed output This makes it a lot easier to read... if you have a really wide display.
2010-03-25 18:29:25 -07:00
IR print visitor: Print assignments
2010-03-09 16:40:45 -08:00
ir->lhs->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
IR print visitor: Remove most of the newlines from the printed output This makes it a lot easier to read... if you have a really wide display.
2010-03-25 18:29:25 -07:00
IR print visitor: Print assignments
2010-03-09 16:40:45 -08:00
ir->rhs->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ") ");
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
}
void ir_print_visitor::visit(ir_constant *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(constant ");
print_type(f, ir->type);
fprintf(f, " (");
IR print visitor: Finish printing constants
2010-03-25 18:38:28 -07:00
ir_print_visitor: Print out constant arrays.
2010-07-20 01:28:09 -07:00
if (ir->type->is_array()) {
for (unsigned i = 0; i < ir->type->length; i++)
ir->get_array_element(i)->accept(this);
ir_print_visitor: Print out constant structure values. In the form (constant type ((field1 value) (field2 value) ...))
2010-12-02 10:11:49 -08:00
} else if (ir->type->is_record()) {
ir_constant *value = (ir_constant *) ir->components.get_head();
for (unsigned i = 0; i < ir->type->length; i++) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(%s ", ir->type->fields.structure[i].name);
ir_print_visitor: Print out constant structure values. In the form (constant type ((field1 value) (field2 value) ...))
2010-12-02 10:11:49 -08:00
value->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")");
ir_print_visitor: Print out constant structure values. In the form (constant type ((field1 value) (field2 value) ...))
2010-12-02 10:11:49 -08:00
value = (ir_constant *) value->next;
}
ir_print_visitor: Print out constant arrays.
2010-07-20 01:28:09 -07:00
} else {
for (unsigned i = 0; i < ir->type->components(); i++) {
if (i != 0)
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
glsl: Remove pointless uses of glsl_type::get_base_type(). These are effectively doing type->get_base_type()->base_type, which is equivalent to type->base_type. Just use that, as it's simpler. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-10-25 12:55:54 -07:00
switch (ir->type->base_type) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
case GLSL_TYPE_UINT: fprintf(f, "%u", ir->value.u[i]); break;
case GLSL_TYPE_INT: fprintf(f, "%d", ir->value.i[i]); break;
glsl: Add heuristics to print floating-point numbers better. v2: Fix *.expected files to match. Reviewed-by: Paul Berry <strereotype441@gmail.com>
2013-08-04 14:01:30 -07:00
case GLSL_TYPE_FLOAT:
if (ir->value.f[i] == 0.0f)
/* 0.0 == -0.0, so print with %f to get the proper sign. */
glsl: be more consistent about printing constants Make sure that we print the same number of digits when printing 0.0 as any other floating-point number. This will make generating expected output files for tests easier. To avoid breaking "make check," update the generated tests for lower_jumps before the next commit which will bring create_test_cases.py in line with them. Signed-off-by: Connor Abbott <cwabbott0@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-05-27 21:23:02 -04:00
fprintf(f, "%f", ir->value.f[i]);
glsl: Use fabs() on floating point values. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-25 22:18:28 -08:00
else if (fabs(ir->value.f[i]) < 0.000001f)
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "%a", ir->value.f[i]);
glsl: Use fabs() on floating point values. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-25 22:18:28 -08:00
else if (fabs(ir->value.f[i]) > 1000000.0f)
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "%e", ir->value.f[i]);
glsl: Add heuristics to print floating-point numbers better. v2: Fix *.expected files to match. Reviewed-by: Paul Berry <strereotype441@gmail.com>
2013-08-04 14:01:30 -07:00
else
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "%f", ir->value.f[i]);
glsl: Add heuristics to print floating-point numbers better. v2: Fix *.expected files to match. Reviewed-by: Paul Berry <strereotype441@gmail.com>
2013-08-04 14:01:30 -07:00
break;
glsl: fix a crash in ir_print_visitor() for bindless samplers/images Bindless samplers/images are represented with 64-bit unsigned integers and they can be assigned with explicit constructors. Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2017-05-25 19:12:12 +02:00
case GLSL_TYPE_SAMPLER:
case GLSL_TYPE_IMAGE:
case GLSL_TYPE_UINT64:
fprintf(f, "%" PRIu64, ir->value.u64[i]);
break;
glsl: Print GLSL_TYPE_UINT64 and GLSL_TYPE_INT64 values Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2016-09-02 13:17:48 -07:00
case GLSL_TYPE_INT64: fprintf(f, "%" PRIi64, ir->value.i64[i]); break;
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
case GLSL_TYPE_BOOL: fprintf(f, "%d", ir->value.b[i]); break;
glsl/ir: Add printing support for doubles Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
2015-02-05 12:52:19 +02:00
case GLSL_TYPE_DOUBLE:
if (ir->value.d[i] == 0.0)
/* 0.0 == -0.0, so print with %f to get the proper sign. */
fprintf(f, "%.1f", ir->value.d[i]);
else if (fabs(ir->value.d[i]) < 0.000001)
fprintf(f, "%a", ir->value.d[i]);
else if (fabs(ir->value.d[i]) > 1000000.0)
fprintf(f, "%e", ir->value.d[i]);
else
fprintf(f, "%f", ir->value.d[i]);
break;
glsl: Replace assert with unreachable Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Engestrom <eric@engestrom.ch>
2016-09-02 13:15:24 -07:00
default:
unreachable("Invalid constant type");
ir_print_visitor: Print out constant arrays.
2010-07-20 01:28:09 -07:00
}
IR print visitor: Finish printing constants
2010-03-25 18:38:28 -07:00
}
}
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")) ");
IR visitor: Add initial version of ir_visitor classes The ir_visitor class is the abstract base class for all visitors. ir_print_visitor contains the beginnings of a concrete visitor class that will print out an IR sequence in a Lisp / Scheme-like syntax.
2010-03-09 16:23:37 -08:00
}
Add ir_call call to represent function calls.
2010-03-11 14:34:27 -08:00
void
ir_print_visitor::visit(ir_call *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(call %s ", ir->callee_name());
glsl: Convert ir_call to be a statement rather than a value. Aside from ir_call, our IR is cleanly split into two classes: - Statements (typeless; used for side effects, control flow) - Values (deeply nestable, pure, typed expression trees) Unfortunately, ir_call confused all this: - For void functions, we placed ir_call directly in the instruction stream, treating it as an untyped statement. Yet, it was a subclass of ir_rvalue, and no other ir_rvalue could be used in this way. - For functions with a return value, ir_call could be placed in arbitrary expression trees. While this fit naturally with the source language, it meant that expressions might not be pure, making it difficult to transform and optimize them. To combat this, we always emitted ir_call directly in the RHS of an ir_assignment, only using a temporary variable in expression trees. Many passes relied on this assumption; the acos and atan built-ins violated it. This patch makes ir_call a statement (ir_instruction) rather than a value (ir_rvalue). Non-void calls now take a ir_dereference of a variable, and store the return value there---effectively a call and assignment rolled into one. They cannot be embedded in expressions. All expression trees are now pure, without exception. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-03-20 15:56:37 -07:00
if (ir->return_deref)
ir->return_deref->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " (");
glsl: Use typed foreach_in_list instead of foreach_list. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-24 21:34:05 -07:00
foreach_in_list(ir_rvalue, param, &ir->actual_parameters) {
glsl: Cast ir_call parameters to ir_rvalue, not ir_instruction. A function call's parameters are always rvalues. ir_rvalue may not always be a subclass of ir_instruction in the future, so we should use the right one. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-11-23 09:51:52 -08:00
param->accept(this);
IR print visitor: print function calls
2010-03-26 17:30:30 -07:00
}
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "))\n");
Add ir_call call to represent function calls.
2010-03-11 14:34:27 -08:00
}
Implement IR return instructions
2010-03-19 16:44:52 -07:00
void
ir_print_visitor::visit(ir_return *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(return");
Implement IR return instructions
2010-03-19 16:44:52 -07:00
Add new abstract ir_rvalue class; rework accordingly. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-26 00:25:36 -07:00
ir_rvalue *const value = ir->get_value();
Implement IR return instructions
2010-03-19 16:44:52 -07:00
if (value) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
Implement IR return instructions
2010-03-19 16:44:52 -07:00
value->accept(this);
}
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")");
Implement IR return instructions
2010-03-19 16:44:52 -07:00
}
Implement ir_if (for if-statments) and conversion from AST The following tests now pass: glslparsertest/shaders/if1.frag glslparsertest/shaders/if2.frag The following tests that used to pass now fail. It appears that most of these fail because ast_nequal and ast_equal are not converted to HIR. shaders/glsl-unused-varying.frag shaders/glsl-fs-sqrt-branch.frag
2010-03-29 14:11:25 -07:00
glsl2: Define new ir_discard instruction.
2010-06-30 10:47:34 -07:00
void
ir_print_visitor::visit(ir_discard *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(discard ");
glsl2: Define new ir_discard instruction.
2010-06-30 10:47:34 -07:00
if (ir->condition != NULL) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, " ");
glsl2: Define new ir_discard instruction.
2010-06-30 10:47:34 -07:00
ir->condition->accept(this);
}
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")");
glsl2: Define new ir_discard instruction.
2010-06-30 10:47:34 -07:00
}
Implement ir_if (for if-statments) and conversion from AST The following tests now pass: glslparsertest/shaders/if1.frag glslparsertest/shaders/if2.frag The following tests that used to pass now fail. It appears that most of these fail because ast_nequal and ast_equal are not converted to HIR. shaders/glsl-unused-varying.frag shaders/glsl-fs-sqrt-branch.frag
2010-03-29 14:11:25 -07:00
void
ir_print_visitor::visit(ir_if *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(if ");
Implement ir_if (for if-statments) and conversion from AST The following tests now pass: glslparsertest/shaders/if1.frag glslparsertest/shaders/if2.frag The following tests that used to pass now fail. It appears that most of these fail because ast_nequal and ast_equal are not converted to HIR. shaders/glsl-unused-varying.frag shaders/glsl-fs-sqrt-branch.frag
2010-03-29 14:11:25 -07:00
ir->condition->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(\n");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation++;
glsl: Use typed foreach_in_list instead of foreach_list. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-24 21:34:05 -07:00
foreach_in_list(ir_instruction, inst, &ir->then_instructions) {
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
Implement ir_if (for if-statments) and conversion from AST The following tests now pass: glslparsertest/shaders/if1.frag glslparsertest/shaders/if2.frag The following tests that used to pass now fail. It appears that most of these fail because ast_nequal and ast_equal are not converted to HIR. shaders/glsl-unused-varying.frag shaders/glsl-fs-sqrt-branch.frag
2010-03-29 14:11:25 -07:00
inst->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "\n");
Implement ir_if (for if-statments) and conversion from AST The following tests now pass: glslparsertest/shaders/if1.frag glslparsertest/shaders/if2.frag The following tests that used to pass now fail. It appears that most of these fail because ast_nequal and ast_equal are not converted to HIR. shaders/glsl-unused-varying.frag shaders/glsl-fs-sqrt-branch.frag
2010-03-29 14:11:25 -07:00
}
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation--;
indent();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, ")\n");
Implement ir_if (for if-statments) and conversion from AST The following tests now pass: glslparsertest/shaders/if1.frag glslparsertest/shaders/if2.frag The following tests that used to pass now fail. It appears that most of these fail because ast_nequal and ast_equal are not converted to HIR. shaders/glsl-unused-varying.frag shaders/glsl-fs-sqrt-branch.frag
2010-03-29 14:11:25 -07:00
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
ir_print_visitor: Print empty else blocks more compactly
2010-08-12 14:55:48 -07:00
if (!ir->else_instructions.is_empty()) {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(\n");
ir_print_visitor: Print empty else blocks more compactly
2010-08-12 14:55:48 -07:00
indentation++;
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
glsl: Use typed foreach_in_list instead of foreach_list. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-24 21:34:05 -07:00
foreach_in_list(ir_instruction, inst, &ir->else_instructions) {
ir_print_visitor: Print empty else blocks more compactly
2010-08-12 14:55:48 -07:00
indent();
inst->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "\n");
ir_print_visitor: Print empty else blocks more compactly
2010-08-12 14:55:48 -07:00
}
indentation--;
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "))\n");
ir_print_visitor: Print empty else blocks more compactly
2010-08-12 14:55:48 -07:00
} else {
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "())\n");
Implement ir_if (for if-statments) and conversion from AST The following tests now pass: glslparsertest/shaders/if1.frag glslparsertest/shaders/if2.frag The following tests that used to pass now fail. It appears that most of these fail because ast_nequal and ast_equal are not converted to HIR. shaders/glsl-unused-varying.frag shaders/glsl-fs-sqrt-branch.frag
2010-03-29 14:11:25 -07:00
}
}
Add ir_loop to represent loops This touches a lot of files because everything derived from ir_visitor has to be updated. This is the primary disadvantage of the visitor pattern.
2010-04-05 16:16:07 -07:00
void
ir_print_visitor::visit(ir_loop *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "(loop (\n");
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation++;
glsl: Use typed foreach_in_list instead of foreach_list. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-24 21:34:05 -07:00
foreach_in_list(ir_instruction, inst, &ir->body_instructions) {
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indent();
Add ir_loop to represent loops This touches a lot of files because everything derived from ir_visitor has to be updated. This is the primary disadvantage of the visitor pattern.
2010-04-05 16:16:07 -07:00
inst->accept(this);
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "\n");
Add ir_loop to represent loops This touches a lot of files because everything derived from ir_visitor has to be updated. This is the primary disadvantage of the visitor pattern.
2010-04-05 16:16:07 -07:00
}
glsl2: When dumping IR for debug, indent nested blocks. No more trying to match parens in my head when looking at the body of a short function containing an if statement.
2010-07-29 14:36:59 -07:00
indentation--;
indent();
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "))\n");
Add ir_loop to represent loops This touches a lot of files because everything derived from ir_visitor has to be updated. This is the primary disadvantage of the visitor pattern.
2010-04-05 16:16:07 -07:00
}
Add ir_loop_jump to represent 'break' and 'continue' in loops
2010-04-05 16:28:15 -07:00
void
ir_print_visitor::visit(ir_loop_jump *ir)
{
glsl: Add a file argument to the IR printer. While we want to be able to print to stdout for glsl_compiler, for debugging drivers we want to be able to dump to stderr because that's where other driver debug (like LIBGL_DEBUG) tends to go, and because some apps actually close stdout to shut up their own messages (such as the X Server, or NWN). Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-02-20 18:00:23 -08:00
fprintf(f, "%s", ir->is_break() ? "break" : "continue");
Add ir_loop_jump to represent 'break' and 'continue' in loops
2010-04-05 16:28:15 -07:00
}
glsl: add ir_emit_vertex and ir_end_primitive instruction types These correspond to the EmitVertex and EndPrimitive functions in GLSL. v2 (Paul Berry <stereotype441@gmail.com>): Add stub implementations of new pure visitor functions to i965's vec4_visitor and fs_visitor classes. v3 (Paul Berry <stereotype441@gmail.com>): Rename classes to be more consistent with the names used in the GL spec. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-02-15 09:26:35 -06:00
void
glsl: include streamId when reading/printing emit-vertex and end-primitive IR. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-08 13:16:26 +02:00
ir_print_visitor::visit(ir_emit_vertex *ir)
glsl: add ir_emit_vertex and ir_end_primitive instruction types These correspond to the EmitVertex and EndPrimitive functions in GLSL. v2 (Paul Berry <stereotype441@gmail.com>): Add stub implementations of new pure visitor functions to i965's vec4_visitor and fs_visitor classes. v3 (Paul Berry <stereotype441@gmail.com>): Rename classes to be more consistent with the names used in the GL spec. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-02-15 09:26:35 -06:00
{
glsl: include streamId when reading/printing emit-vertex and end-primitive IR. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-08 13:16:26 +02:00
fprintf(f, "(emit-vertex ");
ir->stream->accept(this);
fprintf(f, ")\n");
glsl: add ir_emit_vertex and ir_end_primitive instruction types These correspond to the EmitVertex and EndPrimitive functions in GLSL. v2 (Paul Berry <stereotype441@gmail.com>): Add stub implementations of new pure visitor functions to i965's vec4_visitor and fs_visitor classes. v3 (Paul Berry <stereotype441@gmail.com>): Rename classes to be more consistent with the names used in the GL spec. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-02-15 09:26:35 -06:00
}
void
glsl: include streamId when reading/printing emit-vertex and end-primitive IR. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-08 13:16:26 +02:00
ir_print_visitor::visit(ir_end_primitive *ir)
glsl: add ir_emit_vertex and ir_end_primitive instruction types These correspond to the EmitVertex and EndPrimitive functions in GLSL. v2 (Paul Berry <stereotype441@gmail.com>): Add stub implementations of new pure visitor functions to i965's vec4_visitor and fs_visitor classes. v3 (Paul Berry <stereotype441@gmail.com>): Rename classes to be more consistent with the names used in the GL spec. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-02-15 09:26:35 -06:00
{
glsl: include streamId when reading/printing emit-vertex and end-primitive IR. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-08 13:16:26 +02:00
fprintf(f, "(end-primitive ");
ir->stream->accept(this);
fprintf(f, ")\n");
glsl: Add ir node for barrier v2: * Changes suggested by mattst88 [jordan.l.justen@intel.com: Add nir support] Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
2014-09-07 19:24:15 +12:00
}
glsl: include streamId when reading/printing emit-vertex and end-primitive IR. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-08 13:16:26 +02:00
glsl: Add ir node for barrier v2: * Changes suggested by mattst88 [jordan.l.justen@intel.com: Add nir support] Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
2014-09-07 19:24:15 +12:00
void
glsl: Silence unused parameter warnings builtin_variables.cpp:1062:53: warning: unused parameter 'name_as_gs_input' [-Wunused-parameter] const char *name_as_gs_input) ^ builtin_functions.cpp:4774:47: warning: unused parameter 'intrinsic_name' [-Wunused-parameter] const char *intrinsic_name, ^ builtin_functions.cpp:4907:66: warning: unused parameter 'state' [-Wunused-parameter] _mesa_glsl_find_builtin_function_by_name(_mesa_glsl_parse_state *state, ^ builtin_functions.cpp:4915:49: warning: unused parameter 'num_arguments' [-Wunused-parameter] unsigned num_arguments, ^ builtin_functions.cpp:4916:49: warning: unused parameter 'flags' [-Wunused-parameter] unsigned flags) ^ ir_print_visitor.cpp:589:37: warning: unused parameter 'ir' [-Wunused-parameter] ir_print_visitor::visit(ir_barrier *ir) ^ linker.cpp:3212:48: warning: unused parameter 'ctx' [-Wunused-parameter] build_program_resource_list(struct gl_context *ctx, ^ standalone_scaffolding.cpp:65:57: warning: unused parameter ‘id’ [-Wunused-parameter] _mesa_shader_debug(struct gl_context *, GLenum, GLuint *id, ^ v2: Rebase on top of GL_ARB_shader_image_size work (especially 58a86897). Silence more warnings added by that work. v3: Remove mention of the removed parameter from comments. Suggested by Iago. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> [v1] Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> Cc: "Martin Peres <martin.peres@linux.intel.com>"
2015-08-26 13:38:49 +01:00
ir_print_visitor::visit(ir_barrier *)
glsl: Add ir node for barrier v2: * Changes suggested by mattst88 [jordan.l.justen@intel.com: Add nir support] Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
2014-09-07 19:24:15 +12:00
{
fprintf(f, "(barrier)\n");
glsl: add ir_emit_vertex and ir_end_primitive instruction types These correspond to the EmitVertex and EndPrimitive functions in GLSL. v2 (Paul Berry <stereotype441@gmail.com>): Add stub implementations of new pure visitor functions to i965's vec4_visitor and fs_visitor classes. v3 (Paul Berry <stereotype441@gmail.com>): Rename classes to be more consistent with the names used in the GL spec. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-02-15 09:26:35 -06:00
}
Reference in New Issue Copy Permalink