The goal is to reduce the startup time cost of all of these parsing and string replacement. All comments are now stripped at compile time. This comment check added noticeable slowdown at startup in debug builds and during preprocessing. Put all metadatas between start and end token. Use very simple parsing using `StringRef` and hash all identifiers. Move all the complexity to the preprocessor that massagess the metadata into a well expected input to the runtime parser. All identifiers are compile time hashed so that no string comparison is made at runtime. Speed up the source loading: - from 10ms to 1.6ms (6.25x speedup) in release - from 194ms to 6ms (32.3x speedup) in debug Follow up #129009 Pull Request: https://projects.blender.org/blender/blender/pulls/128927
396 lines
12 KiB
C++
396 lines
12 KiB
C++
/* SPDX-FileCopyrightText: 2021 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup gpu
|
|
*/
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "BLI_dynstr.h"
|
|
#include "BLI_string.h"
|
|
#include "BLI_string_utils.hh"
|
|
#include "BLI_vector.hh"
|
|
|
|
#include "GPU_storage_buffer.hh"
|
|
|
|
#include "gpu_context_private.hh"
|
|
#include "gpu_shader_dependency_private.hh"
|
|
#include "gpu_shader_private.hh"
|
|
|
|
#include "CLG_log.h"
|
|
|
|
static CLG_LogRef LOG = {"gpu.shader"};
|
|
|
|
namespace blender::gpu {
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
/** \name Debug functions
|
|
* \{ */
|
|
|
|
/* Number of lines before and after the error line to print for compilation errors. */
|
|
#define DEBUG_CONTEXT_LINES 0
|
|
/**
|
|
* Print dependencies sources list before the shader report.
|
|
* Useful to debug include order or missing dependencies.
|
|
*/
|
|
#define DEBUG_DEPENDENCIES 0
|
|
|
|
void Shader::print_log(Span<const char *> sources,
|
|
const char *log,
|
|
const char *stage,
|
|
const bool error,
|
|
GPULogParser *parser)
|
|
{
|
|
const char line_prefix[] = " | ";
|
|
char err_col[] = "\033[31;1m";
|
|
char warn_col[] = "\033[33;1m";
|
|
char info_col[] = "\033[0;2m";
|
|
char reset_col[] = "\033[0;0m";
|
|
char *sources_combined = BLI_string_join_arrayN((const char **)sources.data(), sources.size());
|
|
DynStr *dynstr = BLI_dynstr_new();
|
|
|
|
if (!CLG_color_support_get(&LOG)) {
|
|
err_col[0] = warn_col[0] = info_col[0] = reset_col[0] = '\0';
|
|
}
|
|
|
|
BLI_dynstr_appendf(dynstr, "\n");
|
|
|
|
#if DEBUG_DEPENDENCIES
|
|
BLI_dynstr_appendf(
|
|
dynstr, "%s%sIncluded files (in order):%s\n", info_col, line_prefix, reset_col);
|
|
#endif
|
|
|
|
Vector<int64_t> sources_end_line;
|
|
for (StringRefNull src : sources) {
|
|
int64_t cursor = 0, line_count = 0;
|
|
while ((cursor = src.find('\n', cursor) + 1)) {
|
|
line_count++;
|
|
}
|
|
if (sources_end_line.is_empty() == false) {
|
|
line_count += sources_end_line.last();
|
|
}
|
|
sources_end_line.append(line_count);
|
|
#if DEBUG_DEPENDENCIES
|
|
StringRefNull filename = shader::gpu_shader_dependency_get_filename_from_source_string(src);
|
|
if (!filename.is_empty()) {
|
|
BLI_dynstr_appendf(
|
|
dynstr, "%s%s %s%s\n", info_col, line_prefix, filename.c_str(), reset_col);
|
|
}
|
|
#endif
|
|
}
|
|
if (sources_end_line.is_empty()) {
|
|
sources_end_line.append(0);
|
|
}
|
|
|
|
const char *log_line = log, *line_end;
|
|
|
|
LogCursor previous_location;
|
|
|
|
bool found_line_id = false;
|
|
while ((line_end = strchr(log_line, '\n'))) {
|
|
/* Skip empty lines. */
|
|
if (line_end == log_line) {
|
|
log_line++;
|
|
continue;
|
|
}
|
|
|
|
/* Silence not useful lines. */
|
|
StringRef logref = StringRefNull(log_line).substr(0, size_t(line_end) - size_t(log_line));
|
|
if (logref.endswith(" shader failed to compile with the following errors:") ||
|
|
logref.endswith(" No code generated"))
|
|
{
|
|
log_line += size_t(line_end) - size_t(log_line);
|
|
continue;
|
|
}
|
|
|
|
GPULogItem log_item;
|
|
log_line = parser->parse_line(sources_combined, log_line, log_item);
|
|
|
|
/* Empty line, skip. */
|
|
if ((log_item.cursor.row == -1) && ELEM(log_line[0], '\n', '\0')) {
|
|
continue;
|
|
}
|
|
|
|
/* Sanitize output. Really bad values can happen when the error line is buggy. */
|
|
if (log_item.cursor.source >= sources.size()) {
|
|
log_item.cursor.source = -1;
|
|
}
|
|
if (log_item.cursor.row >= sources_end_line.last()) {
|
|
log_item.cursor.source = -1;
|
|
log_item.cursor.row = -1;
|
|
}
|
|
|
|
if (log_item.cursor.row == -1) {
|
|
found_line_id = false;
|
|
}
|
|
|
|
const char *src_line = sources_combined;
|
|
|
|
/* Separate from previous block. */
|
|
if (previous_location.source != log_item.cursor.source ||
|
|
previous_location.row != log_item.cursor.row)
|
|
{
|
|
BLI_dynstr_appendf(dynstr, "%s%s%s\n", info_col, line_prefix, reset_col);
|
|
}
|
|
else if (log_item.cursor.column != previous_location.column) {
|
|
BLI_dynstr_appendf(dynstr, "%s\n", line_prefix);
|
|
}
|
|
/* Print line from the source file that is producing the error. */
|
|
if ((log_item.cursor.row != -1) && (log_item.cursor.row != previous_location.row ||
|
|
log_item.cursor.column != previous_location.column))
|
|
{
|
|
const char *src_line_end;
|
|
found_line_id = false;
|
|
int src_line_index = 0;
|
|
while ((src_line_end = strchr(src_line, '\n'))) {
|
|
if (src_line_index >= log_item.cursor.row) {
|
|
found_line_id = true;
|
|
break;
|
|
}
|
|
if (src_line_index >= log_item.cursor.row - DEBUG_CONTEXT_LINES) {
|
|
BLI_dynstr_appendf(dynstr, "%5d | ", src_line_index);
|
|
BLI_dynstr_nappend(dynstr, src_line, (src_line_end + 1) - src_line);
|
|
}
|
|
/* Continue to next line. */
|
|
src_line = src_line_end + 1;
|
|
src_line_index++;
|
|
}
|
|
/* Print error source. */
|
|
if (found_line_id) {
|
|
if (log_item.cursor.row != previous_location.row) {
|
|
BLI_dynstr_appendf(dynstr, "%5d | ", src_line_index);
|
|
}
|
|
else {
|
|
BLI_dynstr_appendf(dynstr, line_prefix);
|
|
}
|
|
BLI_dynstr_nappend(dynstr, src_line, (src_line_end + 1) - src_line);
|
|
/* Print char offset. */
|
|
BLI_dynstr_appendf(dynstr, line_prefix);
|
|
if (log_item.cursor.column != -1) {
|
|
for (int i = 0; i < log_item.cursor.column; i++) {
|
|
BLI_dynstr_appendf(dynstr, " ");
|
|
}
|
|
BLI_dynstr_appendf(dynstr, "^");
|
|
}
|
|
BLI_dynstr_appendf(dynstr, "\n");
|
|
|
|
/* Skip the error line. */
|
|
src_line = src_line_end + 1;
|
|
src_line_index++;
|
|
while ((src_line_end = strchr(src_line, '\n'))) {
|
|
if (src_line_index > log_item.cursor.row + DEBUG_CONTEXT_LINES) {
|
|
break;
|
|
}
|
|
BLI_dynstr_appendf(dynstr, "%5d | ", src_line_index);
|
|
BLI_dynstr_nappend(dynstr, src_line, (src_line_end + 1) - src_line);
|
|
/* Continue to next line. */
|
|
src_line = src_line_end + 1;
|
|
src_line_index++;
|
|
}
|
|
}
|
|
}
|
|
BLI_dynstr_appendf(dynstr, line_prefix);
|
|
|
|
/* Search the correct source index. */
|
|
int row_in_file = log_item.cursor.row;
|
|
int source_index = log_item.cursor.source;
|
|
if (source_index <= 0) {
|
|
for (auto i : sources_end_line.index_range()) {
|
|
if (log_item.cursor.row <= sources_end_line[i]) {
|
|
source_index = i;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (source_index > 0) {
|
|
row_in_file -= sources_end_line[source_index - 1];
|
|
}
|
|
/* Print the filename the error line is coming from. */
|
|
if (!log_item.cursor.file_name_and_error_line.is_empty()) {
|
|
char name_buf[256];
|
|
log_item.cursor.file_name_and_error_line.substr(0, sizeof(name_buf) - 1).copy(name_buf);
|
|
BLI_dynstr_appendf(dynstr, "%s%s: %s", info_col, name_buf, reset_col);
|
|
}
|
|
else if (source_index > 0) {
|
|
StringRefNull filename = shader::gpu_shader_dependency_get_filename_from_source_string(
|
|
sources[source_index]);
|
|
if (!filename.is_empty()) {
|
|
BLI_dynstr_appendf(dynstr,
|
|
"%s%s:%d:%d: %s",
|
|
info_col,
|
|
filename.c_str(),
|
|
row_in_file,
|
|
log_item.cursor.column + 1,
|
|
reset_col);
|
|
}
|
|
}
|
|
|
|
if (log_item.severity == Severity::Error) {
|
|
BLI_dynstr_appendf(dynstr, "%s%s%s: ", err_col, "Error", info_col);
|
|
}
|
|
else if (log_item.severity == Severity::Warning) {
|
|
BLI_dynstr_appendf(dynstr, "%s%s%s: ", warn_col, "Warning", info_col);
|
|
}
|
|
else if (log_item.severity == Severity::Note) {
|
|
BLI_dynstr_appendf(dynstr, "%s%s%s: ", warn_col, "Note", info_col);
|
|
}
|
|
/* Print the error itself. */
|
|
BLI_dynstr_append(dynstr, info_col);
|
|
BLI_dynstr_nappend(dynstr, log_line, (line_end + 1) - log_line);
|
|
BLI_dynstr_append(dynstr, reset_col);
|
|
/* Continue to next line. */
|
|
log_line = line_end + 1;
|
|
previous_location = log_item.cursor;
|
|
}
|
|
|
|
CLG_Severity severity = error ? CLG_SEVERITY_ERROR : CLG_SEVERITY_WARN;
|
|
|
|
if (((LOG.type->flag & CLG_FLAG_USE) && (LOG.type->level >= 0)) ||
|
|
(severity >= CLG_SEVERITY_WARN))
|
|
{
|
|
if (DEBUG_LOG_SHADER_SRC_ON_ERROR && error) {
|
|
CLG_log_str(LOG.type, severity, this->name, stage, sources_combined);
|
|
}
|
|
const char *_str = BLI_dynstr_get_cstring(dynstr);
|
|
CLG_log_str(LOG.type, severity, this->name, stage, _str);
|
|
MEM_freeN((void *)_str);
|
|
}
|
|
|
|
MEM_freeN(sources_combined);
|
|
BLI_dynstr_free(dynstr);
|
|
}
|
|
|
|
const char *GPULogParser::skip_severity(const char *log_line,
|
|
GPULogItem &log_item,
|
|
const char *error_msg,
|
|
const char *warning_msg,
|
|
const char *note_msg) const
|
|
{
|
|
if (STREQLEN(log_line, error_msg, strlen(error_msg))) {
|
|
log_line += strlen(error_msg);
|
|
log_item.severity = Severity::Error;
|
|
}
|
|
else if (STREQLEN(log_line, warning_msg, strlen(warning_msg))) {
|
|
log_line += strlen(warning_msg);
|
|
log_item.severity = Severity::Warning;
|
|
}
|
|
else if (STREQLEN(log_line, note_msg, strlen(note_msg))) {
|
|
log_line += strlen(note_msg);
|
|
log_item.severity = Severity::Note;
|
|
}
|
|
return log_line;
|
|
}
|
|
|
|
const char *GPULogParser::skip_separators(const char *log_line, const StringRef separators) const
|
|
{
|
|
while (at_any(log_line, separators)) {
|
|
log_line++;
|
|
}
|
|
return log_line;
|
|
}
|
|
|
|
const char *GPULogParser::skip_until(const char *log_line, char stop_char) const
|
|
{
|
|
const char *cursor = log_line;
|
|
while (!ELEM(cursor[0], '\n', '\0')) {
|
|
if (cursor[0] == stop_char) {
|
|
return cursor;
|
|
}
|
|
cursor++;
|
|
}
|
|
return log_line;
|
|
}
|
|
|
|
bool GPULogParser::at_number(const char *log_line) const
|
|
{
|
|
return log_line[0] >= '0' && log_line[0] <= '9';
|
|
}
|
|
|
|
bool GPULogParser::at_any(const char *log_line, const StringRef chars) const
|
|
{
|
|
return chars.find(log_line[0]) != StringRef::not_found;
|
|
}
|
|
|
|
int GPULogParser::parse_number(const char *log_line, const char **r_new_position) const
|
|
{
|
|
return int(strtol(log_line, const_cast<char **>(r_new_position), 10));
|
|
}
|
|
|
|
/** \} */
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
/** \name Shader Debug Printf
|
|
* \{ */
|
|
|
|
void printf_begin(Context *ctx)
|
|
{
|
|
if (ctx == nullptr) {
|
|
return;
|
|
}
|
|
if (!shader::gpu_shader_dependency_has_printf()) {
|
|
return;
|
|
}
|
|
BLI_assert(ctx->printf_buf == nullptr);
|
|
ctx->printf_buf = GPU_storagebuf_create(GPU_SHADER_PRINTF_MAX_CAPACITY * sizeof(uint32_t));
|
|
GPU_storagebuf_clear_to_zero(ctx->printf_buf);
|
|
}
|
|
|
|
void printf_end(Context *ctx)
|
|
{
|
|
if (ctx == nullptr) {
|
|
return;
|
|
}
|
|
if (ctx->printf_buf == nullptr) {
|
|
return;
|
|
}
|
|
|
|
Vector<uint32_t> data(GPU_SHADER_PRINTF_MAX_CAPACITY);
|
|
GPU_storagebuf_read(ctx->printf_buf, data.data());
|
|
GPU_storagebuf_free(ctx->printf_buf);
|
|
ctx->printf_buf = nullptr;
|
|
|
|
uint32_t data_len = data[0];
|
|
if (data_len == 0) {
|
|
return;
|
|
}
|
|
if (data_len >= GPU_SHADER_PRINTF_MAX_CAPACITY) {
|
|
printf("Printf buffer overflow.\n");
|
|
/* TODO(fclem): We can still read the uncorrupted part. */
|
|
return;
|
|
}
|
|
|
|
int cursor = 1;
|
|
while (cursor < data_len + 1) {
|
|
uint32_t format_hash = data[cursor++];
|
|
|
|
const shader::PrintfFormat &format = shader::gpu_shader_dependency_get_printf_format(
|
|
format_hash);
|
|
|
|
for (const shader::PrintfFormat::Block &block : format.format_blocks) {
|
|
switch (block.type) {
|
|
case shader::PrintfFormat::Block::NONE:
|
|
printf("%s", block.fmt.c_str());
|
|
break;
|
|
case shader::PrintfFormat::Block::UINT:
|
|
printf(block.fmt.c_str(), *reinterpret_cast<uint32_t *>(&data[cursor++]));
|
|
break;
|
|
case shader::PrintfFormat::Block::INT:
|
|
printf(block.fmt.c_str(), *reinterpret_cast<int32_t *>(&data[cursor++]));
|
|
break;
|
|
case shader::PrintfFormat::Block::FLOAT:
|
|
printf(block.fmt.c_str(), *reinterpret_cast<float *>(&data[cursor++]));
|
|
break;
|
|
default:
|
|
BLI_assert_unreachable();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/** \} */
|
|
|
|
} // namespace blender::gpu
|