aco: Use correct reference type in for-range-loop.

[mesa.git] / src / amd / compiler / aco_interface.cpp

diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp
index 686fdca14e9e3c908366f672cf268c9790af5b80..3031bb43f7a31a354dd17d06cb19c379c067ddec 100644 (file)
--- a/src/amd/compiler/aco_interface.cpp
+++ b/src/amd/compiler/aco_interface.cpp
@@ -54,6 +54,20 @@ static void init()
 }
 }
 
+static radv_compiler_statistic_info statistic_infos[] = {
+   [aco::statistic_hash] = {"Hash", "CRC32 hash of code and constant data"},
+   [aco::statistic_instructions] = {"Instructions", "Instruction count"},
+   [aco::statistic_copies] = {"Copies", "Copy instructions created for pseudo-instructions"},
+   [aco::statistic_branches] = {"Branches", "Branch instructions"},
+   [aco::statistic_cycles] = {"Busy Cycles", "Estimate of busy cycles"},
+   [aco::statistic_vmem_clauses] = {"VMEM Clause", "Number of VMEM clauses (includes 1-sized clauses)"},
+   [aco::statistic_smem_clauses] = {"SMEM Clause", "Number of SMEM clauses (includes 1-sized clauses)"},
+   [aco::statistic_vmem_score] = {"VMEM Score", "Average VMEM def-use distances"},
+   [aco::statistic_smem_score] = {"SMEM Score", "Average SMEM def-use distances"},
+   [aco::statistic_sgpr_presched] = {"Pre-Sched SGPRs", "SGPR usage before scheduling"},
+   [aco::statistic_vgpr_presched] = {"Pre-Sched VGPRs", "VGPR usage before scheduling"},
+};
+
 void aco_compile_shader(unsigned shader_count,
                         struct nir_shader *const *shaders,
                         struct radv_shader_binary **binary,
@@ -64,6 +78,10 @@ void aco_compile_shader(unsigned shader_count,
    ac_shader_config config = {0};
    std::unique_ptr<aco::Program> program{new aco::Program};
 
+   program->collect_statistics = args->options->record_stats;
+   if (program->collect_statistics)
+      memset(program->statistics, 0, sizeof(program->statistics));
+
    /* Instruction Selection */
    if (args->is_gs_copy_shader)
       aco::select_gs_copy_shader(program.get(), shaders[0], &config, args);
@@ -75,9 +93,9 @@ void aco_compile_shader(unsigned shader_count,
    }
    aco::validate(program.get(), stderr);
 
-   /* Boolean phi lowering */
-   aco::lower_bool_phis(program.get());
-   //std::cerr << "After Boolean Phi Lowering:\n";
+   /* Phi lowering */
+   aco::lower_phis(program.get());
+   //std::cerr << "After Phi Lowering:\n";
    //aco_print_program(program.get(), stderr);
 
    aco::dominator_tree(program.get());
@@ -94,6 +112,9 @@ void aco_compile_shader(unsigned shader_count,
    aco::live live_vars = aco::live_var_analysis(program.get(), args->options);
    aco::spill(program.get(), live_vars, args->options);
 
+   if (program->collect_statistics)
+      aco::collect_presched_stats(program.get());
+
    //std::cerr << "Before Schedule:\n";
    //aco_print_program(program.get(), stderr);
    aco::schedule_program(program.get(), live_vars);
@@ -139,10 +160,16 @@ void aco_compile_shader(unsigned shader_count,
    //std::cerr << "After Insert-Waitcnt:\n";
    //aco_print_program(program.get(), stderr);
 
+   if (program->collect_statistics)
+      aco::collect_preasm_stats(program.get());
+
    /* Assembly */
    std::vector<uint32_t> code;
    unsigned exec_size = aco::emit_program(program.get(), code);
 
+   if (program->collect_statistics)
+      aco::collect_postasm_stats(program.get(), code);
+
    bool get_disasm = args->options->dump_shader || args->options->record_ir;
 
    size_t size = llvm_ir.size();
@@ -156,6 +183,11 @@ void aco_compile_shader(unsigned shader_count,
       size += disasm.size();
    }
 
+   size_t stats_size = 0;
+   if (program->collect_statistics)
+      stats_size = sizeof(radv_compiler_statistics) + aco::num_statistics * sizeof(uint32_t);
+   size += stats_size;
+
    size += code.size() * sizeof(uint32_t) + sizeof(radv_shader_binary_legacy);
    /* We need to calloc to prevent unintialized data because this will be used
     * directly for the disk cache. Uninitialized data can appear because of
@@ -168,7 +200,15 @@ void aco_compile_shader(unsigned shader_count,
    legacy_binary->base.is_gs_copy_shader = args->is_gs_copy_shader;
    legacy_binary->base.total_size = size;
 
-   memcpy(legacy_binary->data, code.data(), code.size() * sizeof(uint32_t));
+   if (program->collect_statistics) {
+      radv_compiler_statistics *statistics = (radv_compiler_statistics *)legacy_binary->data;
+      statistics->count = aco::num_statistics;
+      statistics->infos = statistic_infos;
+      memcpy(statistics->values, program->statistics, aco::num_statistics * sizeof(uint32_t));
+   }
+   legacy_binary->stats_size = stats_size;
+
+   memcpy(legacy_binary->data + legacy_binary->stats_size, code.data(), code.size() * sizeof(uint32_t));
    legacy_binary->exec_size = exec_size;
    legacy_binary->code_size = code.size() * sizeof(uint32_t);
 
@@ -176,10 +216,10 @@ void aco_compile_shader(unsigned shader_count,
    legacy_binary->disasm_size = 0;
    legacy_binary->ir_size = llvm_ir.size();
 
-   llvm_ir.copy((char*) legacy_binary->data + legacy_binary->code_size, llvm_ir.size());
+   llvm_ir.copy((char*) legacy_binary->data + legacy_binary->stats_size + legacy_binary->code_size, llvm_ir.size());
 
    if (get_disasm) {
-      disasm.copy((char*) legacy_binary->data + legacy_binary->code_size + llvm_ir.size(), disasm.size());
+      disasm.copy((char*) legacy_binary->data + legacy_binary->stats_size + legacy_binary->code_size + llvm_ir.size(), disasm.size());
       legacy_binary->disasm_size = disasm.size();
    }