diff options
Diffstat (limited to 'src')
3 files changed, 137 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp index 8a73f8c99cc..d984184e701 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp @@ -590,6 +590,19 @@ lifetime temp_comp_access::get_required_lifetime() return make_lifetime(first_write, last_read); } +/* Helper class for sorting and searching the registers based + * on life times. */ +struct access_record { + int begin; + int end; + int reg; + bool erase; + + bool operator < (const access_record& rhs) const { + return begin < rhs.begin; + } +}; + } #ifndef NDEBUG @@ -794,6 +807,110 @@ get_temp_registers_required_lifetimes(void *mem_ctx, exec_list *instructions, return true; } +/* Find the next register between [start, end) that has a life time starting + * at or after bound by using a binary search. + * start points at the beginning of the search range, + * end points at the element past the end of the search range, and + * the array comprising [start, end) must be sorted in ascending order. + */ +static access_record* +find_next_rename(access_record* start, access_record* end, int bound) +{ + int delta = (end - start); + + while (delta > 0) { + int half = delta >> 1; + access_record* middle = start + half; + + if (bound <= middle->begin) { + delta = half; + } else { + start = middle; + ++start; + delta -= half + 1; + } + } + + return start; +} + +#ifndef USE_STL_SORT +static int access_record_compare (const void *a, const void *b) { + const access_record *aa = static_cast<const access_record*>(a); + const access_record *bb = static_cast<const access_record*>(b); + return aa->begin < bb->begin ? -1 : (aa->begin > bb->begin ? 1 : 0); +} +#endif + +/* This functions evaluates the register merges by using a binary + * search to find suitable merge candidates. */ +void get_temp_registers_remapping(void *mem_ctx, int ntemps, + const struct lifetime* lifetimes, + struct rename_reg_pair *result) +{ + access_record *reg_access = ralloc_array(mem_ctx, access_record, ntemps); + + int used_temps = 0; + for (int i = 0; i < ntemps; ++i) { + if (lifetimes[i].begin >= 0) { + reg_access[used_temps].begin = lifetimes[i].begin; + reg_access[used_temps].end = lifetimes[i].end; + reg_access[used_temps].reg = i; + reg_access[used_temps].erase = false; + ++used_temps; + } + } + +#ifdef USE_STL_SORT + std::sort(reg_access, reg_access + used_temps); +#else + std::qsort(reg_access, used_temps, sizeof(access_record), access_record_compare); +#endif + + access_record *trgt = reg_access; + access_record *reg_access_end = reg_access + used_temps; + access_record *first_erase = reg_access_end; + access_record *search_start = trgt + 1; + + while (trgt != reg_access_end) { + access_record *src = find_next_rename(search_start, reg_access_end, + trgt->end); + if (src != reg_access_end) { + result[src->reg].new_reg = trgt->reg; + result[src->reg].valid = true; + trgt->end = src->end; + + /* Since we only search forward, don't remove the renamed + * register just now, only mark it. */ + src->erase = true; + + if (first_erase == reg_access_end) + first_erase = src; + + search_start = src + 1; + } else { + /* Moving to the next target register it is time to remove + * the already merged registers from the search range */ + if (first_erase != reg_access_end) { + access_record *outp = first_erase; + access_record *inp = first_erase + 1; + + while (inp != reg_access_end) { + if (!inp->erase) + *outp++ = *inp; + ++inp; + } + + reg_access_end = outp; + first_erase = reg_access_end; + } + ++trgt; + search_start = trgt + 1; + } + } + ralloc_free(reg_access); +} + /* Code below used for debugging */ #ifndef NDEBUG static const char swizzle_txt[] = "xyzw"; diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.h b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.h index 4bfe383aaad..3f21b1317a2 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.h +++ b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.h @@ -55,5 +55,17 @@ struct lifetime { bool get_temp_registers_required_lifetimes(void *mem_ctx, exec_list *instructions, int ntemps, struct lifetime *lifetimes); +/** Estimate the merge remapping of the registers. + * @param[in] mem_ctx a memory context that can be used with the ralloc_* functions + * @param[in] ntemps number of temporaries reserved for this shader + * @param[in] lifetimes required life time for each temporary register. + * @param[in,out] result memory location to store the register remapping table. + * On input the parameter must point to allocated memory that can hold the + * renaming information for ntemps registers, on output the mapping is stored. + * Note that TEMP[0] is not considered for register renaming. + */ +void get_temp_registers_remapping(void *mem_ctx, int ntemps, + const struct lifetime* lifetimes, + struct rename_reg_pair *result); #endif
\ No newline at end of file diff --git a/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp b/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp index 7778883f7de..e2004af6c6f 100644 --- a/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp +++ b/src/mesa/state_tracker/tests/test_glsl_to_tgsi_lifetime.cpp @@ -1366,9 +1366,11 @@ void LifetimeEvaluatorTest::run(const vector<MockCodeline>& code, const expectat MockShader shader(code); std::vector<lifetime> result(shader.get_num_temps()); - get_temp_registers_required_lifetimes(mem_ctx, shader.get_program(), - shader.get_num_temps(), &result[0]); + bool success = + get_temp_registers_required_lifetimes(mem_ctx, shader.get_program(), + shader.get_num_temps(), &result[0]); + ASSERT_TRUE(success); ASSERT_EQ(result.size(), e.size()); check(result, e); } @@ -1379,9 +1381,10 @@ void LifetimeEvaluatorTest::run(const vector<MockCodelineWithSwizzle>& code, MockShader shader(code); std::vector<lifetime> result(shader.get_num_temps()); - get_temp_registers_required_lifetimes(mem_ctx, shader.get_program(), - shader.get_num_temps(), &result[0]); - + bool success = + get_temp_registers_required_lifetimes(mem_ctx, shader.get_program(), + shader.get_num_temps(), &result[0]); + ASSERT_TRUE(success); ASSERT_EQ(result.size(), e.size()); check(result, e); } |