OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: remove now unused ir reader

Browse Source 
This was used to parse glsl ir in string format and create real ir with
it. It was previously used for some really old test infrastructure which
has now been removed so lets burn this with fire also.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32364>
This commit is contained in:
Timothy Arceri
2024-11-27 16:58:15 +11:00
committed by Marge Bot
parent 722f939614
commit 1f954a207b
5 changed files with 0 additions and 1649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1214
src/compiler/glsl/ir_reader.cpp
View File

File diff suppressed because it is too large Load Diff

33
src/compiler/glsl/ir_reader.h
View File

@@ -1,33 +0,0 @@
/* -*- c++ -*- */
/*
* 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.
*/
#ifndef IR_READER_H
#define IR_READER_H
#include "ir.h"
void _mesa_glsl_read_ir(_mesa_glsl_parse_state *state, exec_list *instructions,
const char *src, bool scan_for_prototypes);
#endif /* IR_READER_H */

4
src/compiler/glsl/meson.build
View File

@@ -160,8 +160,6 @@ files_libglsl = files(
'ir_optimization.h',
'ir_print_visitor.cpp',
'ir_print_visitor.h',
'ir_reader.cpp',
'ir_reader.h',
'ir_rvalue_visitor.cpp',
'ir_rvalue_visitor.h',
'ir_validate.cpp',
@@ -193,8 +191,6 @@ files_libglsl = files(
'opt_tree_grafting.cpp',
'program.h',
'propagate_invariance.cpp',
's_expression.cpp',
's_expression.h',
'string_to_uint_map.cpp',
'string_to_uint_map.h',
'serialize.cpp',

220
src/compiler/glsl/s_expression.cpp
View File

@@ -1,220 +0,0 @@
/* -*- c++ -*- */
/*
* 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 <assert.h>
#include <stdio.h>
#include <math.h>
#include <string.h>
#include <stdlib.h>
#include "s_expression.h"
s_symbol::s_symbol(const char *str, size_t n)
{
/* Assume the given string is already nul-terminated and in memory that
* will live as long as this node.
*/
assert(str[n] == '\0');
this->str = str;
}
s_list::s_list()
{
}
static void
skip_whitespace(const char *&src, char *&symbol_buffer)
{
size_t n = strspn(src, " \v\t\r\n");
src += n;
symbol_buffer += n;
/* Also skip Scheme-style comments: semi-colon 'til end of line */
if (src[0] == ';') {
n = strcspn(src, "\n");
src += n;
symbol_buffer += n;
skip_whitespace(src, symbol_buffer);
}
}
static s_expression *
read_atom(void *ctx, const char *&src, char *&symbol_buffer)
{
s_expression *expr = NULL;
skip_whitespace(src, symbol_buffer);
size_t n = strcspn(src, "( \v\t\r\n);");
if (n == 0)
return NULL; // no atom
// Check for the special symbol '+INF', which means +Infinity. Note: C99
// requires strtof to parse '+INF' as +Infinity, but we still support some
// non-C99-compliant compilers (e.g. MSVC).
if (n == 4 && strncmp(src, "+INF", 4) == 0) {
expr = new(ctx) s_float(INFINITY);
} else {
// Check if the atom is a number.
char *float_end = NULL;
float f = _mesa_strtof(src, &float_end);
if (float_end != src) {
char *int_end = NULL;
int i = strtol(src, &int_end, 10);
// If strtof matched more characters, it must have a decimal part
if (float_end > int_end)
expr = new(ctx) s_float(f);
else
expr = new(ctx) s_int(i);
} else {
// Not a number; return a symbol.
symbol_buffer[n] = '\0';
expr = new(ctx) s_symbol(symbol_buffer, n);
}
}
src += n;
symbol_buffer += n;
return expr;
}
static s_expression *
__read_expression(void *ctx, const char *&src, char *&symbol_buffer)
{
s_expression *atom = read_atom(ctx, src, symbol_buffer);
if (atom != NULL)
return atom;
skip_whitespace(src, symbol_buffer);
if (src[0] == '(') {
++src;
++symbol_buffer;
s_list *list = new(ctx) s_list;
s_expression *expr;
while ((expr = __read_expression(ctx, src, symbol_buffer)) != NULL) {
list->subexpressions.push_tail(expr);
}
skip_whitespace(src, symbol_buffer);
if (src[0] != ')') {
printf("Unclosed expression (check your parenthesis).\n");
return NULL;
}
++src;
++symbol_buffer;
return list;
}
return NULL;
}
s_expression *
s_expression::read_expression(void *ctx, const char *&src)
{
assert(src != NULL);
/* When we encounter a Symbol, we need to save a nul-terminated copy of
* the string. However, ralloc_strndup'ing every individual Symbol is
* extremely expensive. We could avoid this by simply overwriting the
* next character (guaranteed to be whitespace, parens, or semicolon) with
* a nul-byte. But overwriting non-whitespace would mess up parsing.
*
* So, just copy the whole buffer ahead of time. Walk both, leaving the
* original source string unmodified, and altering the copy to contain the
* necessary nul-bytes whenever we encounter a symbol.
*/
char *symbol_buffer = ralloc_strdup(ctx, src);
return __read_expression(ctx, src, symbol_buffer);
}
void s_int::print()
{
printf("%d", this->val);
}
void s_float::print()
{
printf("%f", this->val);
}
void s_symbol::print()
{
printf("%s", this->str);
}
void s_list::print()
{
printf("(");
foreach_in_list(s_expression, expr, &this->subexpressions) {
expr->print();
if (!expr->next->is_tail_sentinel())
printf(" ");
}
printf(")");
}
// --------------------------------------------------
bool
s_pattern::match(s_expression *expr)
{
switch (type)
{
case EXPR: *p_expr = expr; break;
case LIST: if (expr->is_list()) *p_list = (s_list *) expr; break;
case SYMBOL: if (expr->is_symbol()) *p_symbol = (s_symbol *) expr; break;
case NUMBER: if (expr->is_number()) *p_number = (s_number *) expr; break;
case INT: if (expr->is_int()) *p_int = (s_int *) expr; break;
case STRING:
s_symbol *sym = SX_AS_SYMBOL(expr);
if (sym != NULL && strcmp(sym->value(), literal) == 0)
return true;
return false;
};
return *p_expr == expr;
}
bool
s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial)
{
s_list *list = SX_AS_LIST(top);
if (list == NULL)
return false;
unsigned i = 0;
foreach_in_list(s_expression, expr, &list->subexpressions) {
if (i >= n)
return partial; /* More actual items than the pattern expected */
if (expr == NULL || !pattern[i].match(expr))
return false;
i++;
}
if (i < n)
return false; /* Less actual items than the pattern expected */
return true;
}

178
src/compiler/glsl/s_expression.h
View File

@@ -1,178 +0,0 @@
/* -*- c++ -*- */
/*
* 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.
*/
#ifndef S_EXPRESSION_H
#define S_EXPRESSION_H
#include "util/strtod.h"
#include "list.h"
/* Type-safe downcasting macros (also safe to pass NULL) */
#define SX_AS_(t,x) ((x) && ((s_expression*) x)->is_##t()) ? ((s_##t*) (x)) \
: NULL
#define SX_AS_LIST(x) SX_AS_(list, x)
#define SX_AS_SYMBOL(x) SX_AS_(symbol, x)
#define SX_AS_NUMBER(x) SX_AS_(number, x)
#define SX_AS_INT(x) SX_AS_(int, x)
/* Pattern matching macros */
#define MATCH(list, pat) s_match(list, ARRAY_SIZE(pat), pat, false)
#define PARTIAL_MATCH(list, pat) s_match(list, ARRAY_SIZE(pat), pat, true)
/* For our purposes, S-Expressions are:
* - <int>
* - <float>
* - symbol
* - (expr1 expr2 ... exprN) where exprN is an S-Expression
*
* Unlike LISP/Scheme, we do not support (foo . bar) pairs.
*/
class s_expression : public exec_node
{
public:
/**
* Read an S-Expression from the given string.
* Advances the supplied pointer to just after the expression read.
*
* Any allocation will be performed with 'ctx' as the ralloc owner.
*/
static s_expression *read_expression(void *ctx, const char *&src);
/**
* Print out an S-Expression. Useful for debugging.
*/
virtual void print() = 0;
virtual bool is_list() const { return false; }
virtual bool is_symbol() const { return false; }
virtual bool is_number() const { return false; }
virtual bool is_int() const { return false; }
protected:
s_expression() { }
};
/* Atoms */
class s_number : public s_expression
{
public:
bool is_number() const { return true; }
virtual float fvalue() = 0;
protected:
s_number() { }
};
class s_int : public s_number
{
public:
s_int(int x) : val(x) { }
bool is_int() const { return true; }
float fvalue() { return float(this->val); }
int value() { return this->val; }
void print();
private:
int val;
};
class s_float : public s_number
{
public:
s_float(float x) : val(x) { }
float fvalue() { return this->val; }
void print();
private:
float val;
};
class s_symbol : public s_expression
{
public:
s_symbol(const char *, size_t);
bool is_symbol() const { return true; }
const char *value() { return this->str; }
void print();
private:
const char *str;
};
/* Lists of expressions: (expr1 ... exprN) */
class s_list : public s_expression
{
public:
s_list();
virtual bool is_list() const { return true; }
void print();
exec_list subexpressions;
};
// ------------------------------------------------------------
/**
* Part of a pattern to match - essentially a record holding a pointer to the
* storage for the component to match, along with the appropriate type.
*/
class s_pattern {
public:
s_pattern(s_expression *&s) : p_expr(&s), type(EXPR) { }
s_pattern(s_list *&s) : p_list(&s), type(LIST) { }
s_pattern(s_symbol *&s) : p_symbol(&s), type(SYMBOL) { }
s_pattern(s_number *&s) : p_number(&s), type(NUMBER) { }
s_pattern(s_int *&s) : p_int(&s), type(INT) { }
s_pattern(const char *str) : literal(str), type(STRING) { }
bool match(s_expression *expr);
private:
union {
s_expression **p_expr;
s_list **p_list;
s_symbol **p_symbol;
s_number **p_number;
s_int **p_int;
const char *literal;
};
enum { EXPR, LIST, SYMBOL, NUMBER, INT, STRING } type;
};
bool
s_match(s_expression *top, unsigned n, s_pattern *pattern, bool partial);
#endif /* S_EXPRESSION_H */