aco: rename DEBUG_VALIDATE to DEBUG_VALIDATE_IR

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6318>

diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp
index b95c4507c804ffdac44938e05cfe5f411dfc01ec..95c2ac1be08c5d1d6624e8ae5d3e1d4fb0259826 100644 (file)
--- a/src/amd/compiler/aco_interface.cpp
+++ b/src/amd/compiler/aco_interface.cpp
@@ -45,10 +45,10 @@ static radv_compiler_statistic_info statistic_infos[] = {
 
 static void validate(aco::Program *program)
 {
-   if (!(aco::debug_flags & aco::DEBUG_VALIDATE))
+   if (!(aco::debug_flags & aco::DEBUG_VALIDATE_IR))
       return;
 
-   bool is_valid = aco::validate(program, stderr);
+   bool is_valid = aco::validate_ir(program, stderr);
    assert(is_valid);
 }
 

diff --git a/src/amd/compiler/aco_ir.cpp b/src/amd/compiler/aco_ir.cpp
index c028e1788c1cdb559a5823a4192c121d4859bb2c..2a0a500a7b69c9e2803e2c26ac05af86ce295749 100644 (file)
--- a/src/amd/compiler/aco_ir.cpp
+++ b/src/amd/compiler/aco_ir.cpp
@@ -31,7 +31,7 @@ namespace aco {
 uint64_t debug_flags = 0;
 
 static const struct debug_control aco_debug_options[] = {
-   {"validateir", DEBUG_VALIDATE},
+   {"validateir", DEBUG_VALIDATE_IR},
    {"validatera", DEBUG_VALIDATE_RA},
    {"perfwarn", DEBUG_PERFWARN},
    {NULL, 0}
@@ -45,7 +45,7 @@ static void init_once()
 
    #ifndef NDEBUG
    /* enable some flags by default on debug builds */
-   debug_flags |= aco::DEBUG_VALIDATE;
+   debug_flags |= aco::DEBUG_VALIDATE_IR;
    #endif
 }
 

diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h
index 1d6220ef928f3d7df4b447ca3dd93bb293071808..62f9303e793237bdcabb9367317581890cd6557b 100644 (file)
--- a/src/amd/compiler/aco_ir.h
+++ b/src/amd/compiler/aco_ir.h
@@ -46,7 +46,7 @@ namespace aco {
 extern uint64_t debug_flags;
 
 enum {
-   DEBUG_VALIDATE = 0x1,
+   DEBUG_VALIDATE_IR = 0x1,
    DEBUG_VALIDATE_RA = 0x2,
    DEBUG_PERFWARN = 0x4,
 };
@@ -1665,7 +1665,7 @@ void insert_NOPs(Program* program);
 unsigned emit_program(Program* program, std::vector<uint32_t>& code);
 void print_asm(Program *program, std::vector<uint32_t>& binary,
                unsigned exec_size, std::ostream& out);
-bool validate(Program* program, FILE *output);
+bool validate_ir(Program* program, FILE *output);
 bool validate_ra(Program* program, const struct radv_nir_compiler_options *options, FILE *output);
 #ifndef NDEBUG
 void perfwarn(bool cond, const char *msg, Instruction *instr=NULL);

diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp
index 97967aac9c190a1b8cdd2c09b2d0f3ef7d38c143..e9cfe0b43551c81d2bd5fdffc389dfcf9c157a43 100644 (file)
--- a/src/amd/compiler/aco_validate.cpp
+++ b/src/amd/compiler/aco_validate.cpp
@@ -46,7 +46,7 @@ void perfwarn(bool cond, const char *msg, Instruction *instr)
 }
 #endif
 
-bool validate(Program* program, FILE *output)
+bool validate_ir(Program* program, FILE *output)
 {
    bool is_valid = true;
    auto check = [&output, &is_valid](bool check, const char * msg, aco::Instruction * instr) -> void {

diff --git a/src/amd/compiler/tests/helpers.cpp b/src/amd/compiler/tests/helpers.cpp
index 58539db074b1e13eb75ecaeb3e71563ccd635d77..3e2f697814e97eb7c927a671f835ddd828c69e83 100644 (file)
--- a/src/amd/compiler/tests/helpers.cpp
+++ b/src/amd/compiler/tests/helpers.cpp
@@ -146,7 +146,7 @@ void finish_validator_test()
    finish_program(program.get());
    aco_print_program(program.get(), output);
    fprintf(output, "Validation results:\n");
-   if (aco::validate(program.get(), output))
+   if (aco::validate_ir(program.get(), output))
       fprintf(output, "Validation passed\n");
    else
       fprintf(output, "Validation failed\n");
@@ -155,12 +155,12 @@ void finish_validator_test()
 void finish_opt_test()
 {
    finish_program(program.get());
-   if (!aco::validate(program.get(), output)) {
+   if (!aco::validate_ir(program.get(), output)) {
       fail_test("Validation before optimization failed");
       return;
    }
    aco::optimize(program.get());
-   if (!aco::validate(program.get(), output)) {
+   if (!aco::validate_ir(program.get(), output)) {
       fail_test("Validation after optimization failed");
       return;
    }