From d20e6b38692f4d1159fa4219c0985f8b322454e4 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sat, 22 Jun 2019 03:59:56 +0300 Subject: Enable measurer for new database format too --- utils/gen_adldata/measurer.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index 63475ca..d02b2e4 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -85,6 +85,8 @@ struct MeasureThreaded } MeasureThreaded *myself; std::map > >::const_iterator i; + BanksDump *bd; + BanksDump::InstrumentEntry *bd_ins; std::thread m_work; std::atomic_bool m_works; @@ -97,10 +99,12 @@ struct MeasureThreaded void printProgress(); void printFinal(); void run(InstrumentsData::const_iterator i); + void run(BanksDump &bd, BanksDump::InstrumentEntry &e); void waitAll(); }; class OPLChipBase; extern DurationInfo MeasureDurations(const ins &in, OPLChipBase *chip); +extern DurationInfo MeasureDurations(const BanksDump &db, const BanksDump::InstrumentEntry &ins, OPLChipBase *chip); #endif // MEASURER_H -- cgit v1.2.3 From 7c4015695a733f9649f0f3d98c9a79b94b7393da Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sat, 22 Jun 2019 04:31:03 +0300 Subject: Make new cache format for new database entries --- utils/gen_adldata/measurer.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index d02b2e4..ddc66bc 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "progs_cache.h" @@ -54,7 +55,9 @@ private: struct MeasureThreaded { + typedef std::array OperatorsKey; typedef std::map DurationInfoCache; + typedef std::map DurationInfoCacheX; MeasureThreaded() : m_semaphore(int(std::thread::hardware_concurrency()) * 2), @@ -65,6 +68,7 @@ struct MeasureThreaded Semaphore m_semaphore; std::mutex m_durationInfo_mx; DurationInfoCache m_durationInfo; + DurationInfoCacheX m_durationInfoX; std::atomic_bool m_delete_tail; size_t m_total = 0; std::atomic m_done; -- cgit v1.2.3 From d992f42f694e816a1ab2922d2bdc6fc3d1bce408 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sun, 30 Jun 2019 16:31:43 +0300 Subject: New cache format for measured entries --- utils/gen_adldata/measurer.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index ddc66bc..ed7810a 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -77,6 +77,9 @@ struct MeasureThreaded void LoadCache(const char *fileName); void SaveCache(const char *fileName); + void LoadCacheX(const char *fileName); + void SaveCacheX(const char *fileName); + struct destData { destData() -- cgit v1.2.3 From 81f905ea76f0efb6ea35331bd1fe476f14f804de Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Mon, 1 Jul 2019 05:01:55 +0300 Subject: First working of new database // not so stable, needs a polishing, however, multibank from embedded 72'th bank (DMXOPL3) works! --- utils/gen_adldata/measurer.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index ed7810a..d2b8a76 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -59,11 +59,7 @@ struct MeasureThreaded typedef std::map DurationInfoCache; typedef std::map DurationInfoCacheX; - MeasureThreaded() : - m_semaphore(int(std::thread::hardware_concurrency()) * 2), - m_done(0), - m_cache_matches(0) - {} + MeasureThreaded(); Semaphore m_semaphore; std::mutex m_durationInfo_mx; -- cgit v1.2.3 From 6a3a102b21e7d0b4e8fe3147294d9b02f0fcd166 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Tue, 2 Jul 2019 01:11:42 +0300 Subject: Fix for pseudo-4op instruments --- utils/gen_adldata/measurer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index d2b8a76..60fdcb7 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -55,7 +55,7 @@ private: struct MeasureThreaded { - typedef std::array OperatorsKey; + typedef std::array OperatorsKey; typedef std::map DurationInfoCache; typedef std::map DurationInfoCacheX; -- cgit v1.2.3 From e4db1c263355202a9cb033f9e07d42c31e3ff4a5 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Thu, 20 Aug 2020 00:01:06 +0300 Subject: gen_adldata: First step of old code clean-up Verify that all code here is in safe --- utils/gen_adldata/measurer.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index 60fdcb7..f49b9bf 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -70,8 +70,10 @@ struct MeasureThreaded std::atomic m_done; std::atomic m_cache_matches; +#if 0 void LoadCache(const char *fileName); void SaveCache(const char *fileName); +#endif void LoadCacheX(const char *fileName); void SaveCacheX(const char *fileName); @@ -101,13 +103,17 @@ struct MeasureThreaded void printProgress(); void printFinal(); +#if 0 void run(InstrumentsData::const_iterator i); +#endif void run(BanksDump &bd, BanksDump::InstrumentEntry &e); void waitAll(); }; class OPLChipBase; +#if 0 extern DurationInfo MeasureDurations(const ins &in, OPLChipBase *chip); +#endif extern DurationInfo MeasureDurations(const BanksDump &db, const BanksDump::InstrumentEntry &ins, OPLChipBase *chip); #endif // MEASURER_H -- cgit v1.2.3 From f656802667e93be893ebc30a18b0f12482586e6f Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Sun, 23 Aug 2020 22:10:46 +0300 Subject: gen_adldata: remove the rest of old code --- utils/gen_adldata/measurer.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index f49b9bf..5a6acd1 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -70,11 +70,6 @@ struct MeasureThreaded std::atomic m_done; std::atomic m_cache_matches; -#if 0 - void LoadCache(const char *fileName); - void SaveCache(const char *fileName); -#endif - void LoadCacheX(const char *fileName); void SaveCacheX(const char *fileName); @@ -103,17 +98,12 @@ struct MeasureThreaded void printProgress(); void printFinal(); -#if 0 - void run(InstrumentsData::const_iterator i); -#endif + void run(BanksDump &bd, BanksDump::InstrumentEntry &e); void waitAll(); }; class OPLChipBase; -#if 0 -extern DurationInfo MeasureDurations(const ins &in, OPLChipBase *chip); -#endif extern DurationInfo MeasureDurations(const BanksDump &db, const BanksDump::InstrumentEntry &ins, OPLChipBase *chip); #endif // MEASURER_H -- cgit v1.2.3 From 1b4237dffce60e8546e550767b2816c1979bbb9d Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Sun, 23 Aug 2020 23:54:07 +0300 Subject: gen_adldata: Remove more old code --- utils/gen_adldata/measurer.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index 5a6acd1..ca05532 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -56,14 +56,12 @@ private: struct MeasureThreaded { typedef std::array OperatorsKey; - typedef std::map DurationInfoCache; typedef std::map DurationInfoCacheX; MeasureThreaded(); Semaphore m_semaphore; std::mutex m_durationInfo_mx; - DurationInfoCache m_durationInfo; DurationInfoCacheX m_durationInfoX; std::atomic_bool m_delete_tail; size_t m_total = 0; @@ -84,7 +82,6 @@ struct MeasureThreaded m_work.join(); } MeasureThreaded *myself; - std::map > >::const_iterator i; BanksDump *bd; BanksDump::InstrumentEntry *bd_ins; std::thread m_work; -- cgit v1.2.3 From 30504f2ff0fc73ecb4ee6330b17cc768a8686d86 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Mon, 24 Aug 2020 00:49:32 +0300 Subject: gen_adldata: rename some *X suffixes As old calls has been removed, they no longer need to have X suffix --- utils/gen_adldata/measurer.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utils/gen_adldata/measurer.h') diff --git a/utils/gen_adldata/measurer.h b/utils/gen_adldata/measurer.h index ca05532..e521451 100644 --- a/utils/gen_adldata/measurer.h +++ b/utils/gen_adldata/measurer.h @@ -62,14 +62,14 @@ struct MeasureThreaded Semaphore m_semaphore; std::mutex m_durationInfo_mx; - DurationInfoCacheX m_durationInfoX; + DurationInfoCacheX m_durationInfo; std::atomic_bool m_delete_tail; size_t m_total = 0; std::atomic m_done; std::atomic m_cache_matches; - void LoadCacheX(const char *fileName); - void SaveCacheX(const char *fileName); + void LoadCache(const char *fileName); + void SaveCache(const char *fileName); struct destData { -- cgit v1.2.3