1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00

Made an attempt to avoid GCD costs when accumulating Times with a common clock rate (/divisor).

This commit is contained in:
Thomas Harte 2017-07-21 18:20:27 -04:00
parent 9e975a46a2
commit e152ed2e61

View File

@ -25,15 +25,13 @@ struct Time {
Time() : length(0), clock_rate(1) {} Time() : length(0), clock_rate(1) {}
Time(unsigned int unsigned_int_value) : length(unsigned_int_value), clock_rate(1) {} Time(unsigned int unsigned_int_value) : length(unsigned_int_value), clock_rate(1) {}
Time(int int_value) : Time((unsigned int)int_value) {} Time(int int_value) : Time((unsigned int)int_value) {}
Time(unsigned int length, unsigned int clock_rate) : length(length), clock_rate(clock_rate) { simplify(); } Time(unsigned int length, unsigned int clock_rate) : length(length), clock_rate(clock_rate) {}
Time(int length, int clock_rate) : Time((unsigned int)length, (unsigned int)clock_rate) {} Time(int length, int clock_rate) : Time((unsigned int)length, (unsigned int)clock_rate) {}
Time(uint64_t length, uint64_t clock_rate) { Time(uint64_t length, uint64_t clock_rate) {
install_result(length, clock_rate); install_result(length, clock_rate);
simplify();
} }
Time(float value) { Time(float value) {
install_float(value); install_float(value);
simplify();
} }
/*! /*!
@ -94,6 +92,10 @@ struct Time {
inline Time &operator += (const Time &other) { inline Time &operator += (const Time &other) {
if(!other.length) return *this; if(!other.length) return *this;
if(!length) {
*this = other;
return *this;
}
uint64_t result_length; uint64_t result_length;
uint64_t result_clock_rate; uint64_t result_clock_rate;
@ -207,6 +209,12 @@ struct Time {
private: private:
inline void install_result(uint64_t long_length, uint64_t long_clock_rate) { inline void install_result(uint64_t long_length, uint64_t long_clock_rate) {
if(long_length <= std::numeric_limits<unsigned int>::max() && long_clock_rate <= std::numeric_limits<unsigned int>::max()) {
length = (unsigned int)long_length;
clock_rate = (unsigned int)long_clock_rate;
return;
}
// TODO: switch to appropriate values if the result is too large or small to fit, even with trimmed accuracy. // TODO: switch to appropriate values if the result is too large or small to fit, even with trimmed accuracy.
if(!long_length) { if(!long_length) {
length = 0; length = 0;
@ -214,6 +222,11 @@ struct Time {
return; return;
} }
while(!(long_length&0xf) && !(long_clock_rate&0xf)) {
long_length >>= 4;
long_clock_rate >>= 4;
}
while(!(long_length&1) && !(long_clock_rate&1)) { while(!(long_length&1) && !(long_clock_rate&1)) {
long_length >>= 1; long_length >>= 1;
long_clock_rate >>= 1; long_clock_rate >>= 1;