organicmaps/kothic

Fork 0

Speed optimizations #8

Merged

root merged 5 commits from pastk-optimize into master

2023-02-10 15:31:30 +00:00

pastk commented

2023-01-22 16:39:17 +00:00

Member

1.2 times faster styles compilation (from a minute down to 50s in my case).

vng (Migrated from github.com) reviewed 2023-01-22 16:39:17 +00:00

pastk commented

2023-01-22 16:39:57 +00:00

Author

Member

@biodranik @vng
please review

@biodranik @vng please review

pastk commented

2023-01-22 21:35:19 +00:00

Author

Member

Added another (minor) optimization.

pastk commented

2023-01-25 19:11:03 +00:00

Author

Member

Optimized frequently called functions (invoked 6-8 mil times!) - another ~1.3 times improvement.

pastk commented

2023-02-01 09:10:05 +00:00

Author

Member

Added two more commits that give 1.6x speed up
(they depend on https://github.com/organicmaps/organicmaps/pull/4385).

All optimizations combined (incl. #7 ) give a 4.5x speed up.

@vng please review!

Added two more commits that give 1.6x speed up (they depend on https://github.com/organicmaps/organicmaps/pull/4385). All optimizations combined (incl. #7 ) give a 4.5x speed up. @vng please review!

vng (Migrated from github.com) reviewed 2023-02-03 00:40:42 +00:00

src/libkomwm.py

vng (Migrated from github.com) commented

2023-02-03 00:30:04 +00:00

Declare runtime_conditions_arr = [] before if blocks?

src/libkomwm.py

vng (Migrated from github.com) commented

2023-02-03 00:37:01 +00:00

Could you please clarify here? If we have equal styles entry, we assume "overriding".
Or what do we filter here?

Could you please clarify here? If we have equal styles entry, we assume "overriding". Or what do we _filter_ here?

src/mapcss/__init__.py

vng (Migrated from github.com) commented

2023-02-03 00:40:06 +00:00

Should we print warning here and above (unneeded)?
I suspect that we can find a lot of bugs in our current mapcss files ..

Should we print warning here and above (unneeded)? I suspect that we can find a lot of bugs in our current mapcss files ..

pastk reviewed 2023-02-08 09:19:42 +00:00

src/libkomwm.py

pastk commented

2023-02-08 09:19:41 +00:00

Author

Member

Why? I see it'll be a bit more kind of robust.. But it will be either re-assigned or appended anyway, so it'll be just an extra assignment that is always done, but is not really needed, so I decided not to do it...

pastk reviewed 2023-02-08 09:20:08 +00:00

src/libkomwm.py

pastk commented

2023-02-08 09:20:07 +00:00

Author

Member

Sorry I didn't get what do you mean...
Here we want to build the pre-match tree only for unique (type, zoom, clname),
but there is a (only one) case where clname doesn't match the first tag:
building|address;[addr:housenumber][addr:street]
so the pre-match tree made for clname=="building" woulnd't have contained choosers applicable to [addr:housenumber][addr:street], so I had to add the first tag into the unique mix too.

Sorry I didn't get what do you mean... Here we want to build the pre-match tree only for unique (type, zoom, clname), but there is a (only one) case where clname doesn't match the first tag: `building|address;[addr:housenumber][addr:street]` so the pre-match tree made for clname=="building" woulnd't have contained choosers applicable to `[addr:housenumber][addr:street]`, so I had to add the first tag into the unique mix too.

pastk reviewed 2023-02-08 09:21:36 +00:00

src/mapcss/__init__.py

pastk commented

2023-02-08 09:21:36 +00:00

Author

Member

Nope, those discarded rules are actually legit, we remove them just because we have pre-matched
the choosers in this tree leaf to a specific (type, zoom, clname), so we discard rules that don't match for sure.
But those rules will be used still in other tree leaves for other (type, zoom, clname) combinations.

Nope, those discarded rules are actually legit, we remove them just because we have pre-matched the choosers in this tree leaf to a specific (type, zoom, clname), so we discard rules that don't match for sure. But those rules will be used still in other tree leaves for other (type, zoom, clname) combinations.

vng (Migrated from github.com) reviewed 2023-02-08 11:42:21 +00:00

src/libkomwm.py

vng (Migrated from github.com) commented

2023-02-08 11:42:21 +00:00

Because it is used outside of the ifs scope below. Probably, I'm fixed on static-typing languages, but I was confused what "runtime_conditions_arr" var is used below. May be some var from global scope ...

Because it is used outside of the ifs scope below. Probably, I'm _fixed_ on static-typing languages, but I was confused what "runtime_conditions_arr" var is used below. May be some var from global scope ...