Poor redo panel performance when using a big asset library #120494

New Issue

passivestar · 2024-04-10T23:48:50+02:00

passivestar commented

2024-04-10 23:48:50 +02:00

System Information
Operating system: macOS-14.4-arm64-arm-64bit 64 Bits
Graphics card: Metal API Apple M1 Max 1.2

Blender Version
Broken: version: 4.1.1 Release Candidate, branch: blender-v4.1-release, commit date: 2024-04-09 15:11, hash: 917159affcf8
Was also broken in 4.0 and 4.1
Worked: 3.6

Short description of error
When using an asset library with a lot of assets in it (over 15k meshes and materials in total) it becomes noticably slow to change values in the redo panel, see a video here

Exact steps for others to reproduce the error
Since I can't really share my 50GB asset library here I don't know how to make it easy to reproduce, but I suppose one could try creating a blend file with 20000 suzannes in it and mark those as assets? It's possible that the asset library gets refreshed on redo or something like that (the asset library panel doesn't need to be opened for this bug to happen)

**System Information** Operating system: macOS-14.4-arm64-arm-64bit 64 Bits Graphics card: Metal API Apple M1 Max 1.2 **Blender Version** Broken: version: 4.1.1 Release Candidate, branch: blender-v4.1-release, commit date: 2024-04-09 15:11, hash: `917159affcf8` Was also broken in 4.0 and 4.1 Worked: 3.6 **Short description of error** When using an asset library with a lot of assets in it (over 15k meshes and materials in total) it becomes noticably slow to change values in the redo panel, [see a video here](https://twitter.com/passivestar_/status/1738547801653428582) **Exact steps for others to reproduce the error** Since I can't really share my 50GB asset library here I don't know how to make it easy to reproduce, but I suppose one could try creating a blend file with 20000 suzannes in it and mark those as assets? It's possible that the asset library gets refreshed on redo or something like that (the asset library panel doesn't need to be opened for this bug to happen)

passivestar added the

labels 2024-04-10 23:48:51 +02:00

Hans Goudey commented

2024-04-11 04:46:27 +02:00

Thanks for the report. A few clarification questions:

What sort of storage is your asset library on? Hard drive, ssd?
How many separate files does the library consist of?
Anything special about the asset preview images?

Thanks for the report. A few clarification questions: 1. What sort of storage is your asset library on? Hard drive, ssd? 2. How many separate files does the library consist of? 3. Anything special about the asset preview images?

👀 1

Pratik Borhade commented

2024-04-11 04:53:31 +02:00

Hi, thanks for the report. Thought this was fixed already with #115372. Maybe not entirely resolved yet.

Pratik Borhade added

Status

Needs Information from User

and removed

Status

Needs Triage

labels 2024-04-11 05:02:08 +02:00

passivestar commented

2024-04-11 06:11:27 +02:00

Thanks for the report. A few clarification questions:

What sort of storage is your asset library on? Hard drive, ssd?

How many separate files does the library consist of?

Anything special about the asset preview images?

ssd, macbook's built-in
48 blend files
not that I'm aware of, they seem to load just fine. they're all autogenerated

> Thanks for the report. A few clarification questions: > 1. What sort of storage is your asset library on? Hard drive, ssd? > 2. How many separate files does the library consist of? > 3. Anything special about the asset preview images? 1. ssd, macbook's built-in 2. 48 blend files 3. not that I'm aware of, they seem to load just fine. they're all autogenerated

Pratik Borhade added

Status

Needs Triage

and removed

Status

Needs Information from User

labels 2024-04-11 06:51:23 +02:00

Falk David commented

2024-04-11 11:49:18 +02:00

Since this is a bit tricky to set up, I quickly hacked together a python and bash script to make this a bit easier.

Set up a folder that's part of the Preferences > File Paths > Asset Libraries. E.g. /home/test_library/ named Test Library.
In this folder, create a create_assets.py and a script.sh file.
Copy the content from below into the scripts.
Set up the blender_exec e.g. path/to/blender and change the number of files and number of asset you want to create. 500 assets take around 15 seconds to create on my mashine, so that's around 12.5 minutes to run it for 50 blend files.
Run it with bash script.sh to create the whole test asset library.

create_assets.py:

import bpy
import sys
argv = sys.argv[sys.argv.index("--") + 1:]

file_name = argv[0]
num_assets = int(argv[1])

bpy.ops.mesh.primitive_monkey_add(enter_editmode=False)
base_ob_suzanne = bpy.context.active_object

view_layer = bpy.context.view_layer

for i in range(num_assets):
    name = f"TestAsset{file_name}_{i}"
    copy_object = bpy.data.objects.new(name=name, object_data=base_ob_suzanne.data.copy())
    copy_object.asset_mark()
    copy_object.asset_generate_preview()
    view_layer.active_layer_collection.collection.objects.link(copy_object)

bpy.ops.wm.save_mainfile(filepath=f"{file_name}.blend", check_existing=False, exit=True)

script.sh:

#!/bin/bash

blender_exec="blender"
num_files=50
num_assets_per_file=500

for i in $(seq $num_files); do
  file_name="test_asset_file_$i"
  echo "Creating $file_name.blend"
  $blender_exec --background --python create_assets.py -- $file_name $num_assets_per_file
  echo "Done"
done

Since this is a bit tricky to set up, I quickly hacked together a python and bash script to make this a bit easier. 1. Set up a folder that's part of the `Preferences` > `File Paths` > `Asset Libraries`. E.g. `/home/test_library/` named `Test Library`. 2. In this folder, create a `create_assets.py` and a `script.sh` file. 3. Copy the content from below into the scripts. 4. Set up the `blender_exec` e.g. `path/to/blender` and change the number of files and number of asset you want to create. 500 assets take around 15 seconds to create on my mashine, so that's around 12.5 minutes to run it for 50 blend files. 5. Run it with `bash script.sh` to create the whole test asset library. `create_assets.py`: ```py import bpy import sys argv = sys.argv[sys.argv.index("--") + 1:] file_name = argv[0] num_assets = int(argv[1]) bpy.ops.mesh.primitive_monkey_add(enter_editmode=False) base_ob_suzanne = bpy.context.active_object view_layer = bpy.context.view_layer for i in range(num_assets): name = f"TestAsset{file_name}_{i}" copy_object = bpy.data.objects.new(name=name, object_data=base_ob_suzanne.data.copy()) copy_object.asset_mark() copy_object.asset_generate_preview() view_layer.active_layer_collection.collection.objects.link(copy_object) bpy.ops.wm.save_mainfile(filepath=f"{file_name}.blend", check_existing=False, exit=True) ``` `script.sh`: ```sh #!/bin/bash blender_exec="blender" num_files=50 num_assets_per_file=500 for i in $(seq $num_files); do file_name="test_asset_file_$i" echo "Creating $file_name.blend" $blender_exec --background --python create_assets.py -- $file_name $num_assets_per_file echo "Done" done ```

Falk David commented

2024-04-11 12:12:30 +02:00

With a 2.5 GB asset library, I can't notice any slowdowns in the viewport, but I can see blender spending a lot of time in ed::geometry::ui_template_node_operator_asset_root_items (14% of samples) @HooglyBoogly :

Steps to reproduce:

Set up the asset library as described above.
Open Blender with the General template.
Enter edit mode on the Cube, select the top face and extrude it.
Use the sliders in the redo panel to constantly redo the operator

With a 2.5 GB asset library, I can't notice any slowdowns in the viewport, but I can see blender spending a lot of time in `ed::geometry::ui_template_node_operator_asset_root_items` (14% of samples) @HooglyBoogly : ![image](/attachments/acd4b73a-40c0-4967-836a-620946ff5d44) Steps to reproduce: 1. Set up the asset library as described above. 2. Open Blender with the `General` template. 3. Enter edit mode on the `Cube`, select the top face and extrude it. 4. Use the sliders in the redo panel to constantly redo the operator

image.png

186 KiB

👍 1

Hans Goudey commented

2024-04-11 13:58:29 +02:00

Didn't get a chance to test yet, but I'm guessing the problem is that it's trying to search for node tools because it didn't find any. The solution probably looks like this:

diff --git a/source/blender/editors/asset/ED_asset_filter.hh b/source/blender/editors/asset/ED_asset_filter.hh
index 889a51f69da..b9566e1ee1f 100644
--- a/source/blender/editors/asset/ED_asset_filter.hh
+++ b/source/blender/editors/asset/ED_asset_filter.hh
@@ -54,6 +54,7 @@ struct AssetItemTree {
       assets_per_path;
   /** Assets not added to a catalog, not part of #assets_per_path. */
   Vector<asset_system::AssetRepresentation *> unassigned_assets;
+  bool dirty = true;
 };
 
 asset_system::AssetCatalogTree build_filtered_catalog_tree(
diff --git a/source/blender/editors/asset/intern/asset_filter.cc b/source/blender/editors/asset/intern/asset_filter.cc
index 92450986c80..02d9c9a1816 100644
--- a/source/blender/editors/asset/intern/asset_filter.cc
+++ b/source/blender/editors/asset/intern/asset_filter.cc
@@ -150,7 +150,8 @@ AssetItemTree build_filtered_all_catalog_tree(
 
   return {std::move(catalogs_with_node_assets),
           std::move(assets_per_path),
-          std::move(unassigned_assets)};
+          std::move(unassigned_assets),
+          false};
 }
 
 }  // namespace blender::ed::asset
diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc
index d5f15adb170..b39d0622cda 100644
--- a/source/blender/editors/geometry/node_group_operator.cc
+++ b/source/blender/editors/geometry/node_group_operator.cc
@@ -787,7 +787,7 @@ void clear_operator_asset_trees()
   for (const ObjectType type : {OB_MESH, OB_CURVES, OB_POINTCLOUD}) {
     for (const eObjectMode mode : {OB_MODE_OBJECT, OB_MODE_EDIT, OB_MODE_SCULPT_CURVES}) {
       if (asset::AssetItemTree *tree = get_static_item_tree(type, mode)) {
-        *tree = {};
+        tree->dirty = true;
       }
     }
   }
@@ -1105,7 +1105,7 @@ void ui_template_node_operator_asset_root_items(uiLayout &layout, const bContext
   if (!tree) {
     return;
   }
-  if (tree->assets_per_path.size() == 0) {
+  if (tree->dirty) {
     *tree = build_catalog_tree(C, *active_object);
   }

Either way though, the stuff in that profile is probably worth optimizing, since asset libraries will only continue to grow in the future. In particular it's absurd how much time is spent checking if a file is hidden.

Didn't get a chance to test yet, but I'm guessing the problem is that it's trying to search for node tools because it didn't find any. The solution probably looks like this: ```diff diff --git a/source/blender/editors/asset/ED_asset_filter.hh b/source/blender/editors/asset/ED_asset_filter.hh index 889a51f69da..b9566e1ee1f 100644 --- a/source/blender/editors/asset/ED_asset_filter.hh +++ b/source/blender/editors/asset/ED_asset_filter.hh @@ -54,6 +54,7 @@ struct AssetItemTree { assets_per_path; /** Assets not added to a catalog, not part of #assets_per_path. */ Vector<asset_system::AssetRepresentation *> unassigned_assets; + bool dirty = true; }; asset_system::AssetCatalogTree build_filtered_catalog_tree( diff --git a/source/blender/editors/asset/intern/asset_filter.cc b/source/blender/editors/asset/intern/asset_filter.cc index 92450986c80..02d9c9a1816 100644 --- a/source/blender/editors/asset/intern/asset_filter.cc +++ b/source/blender/editors/asset/intern/asset_filter.cc @@ -150,7 +150,8 @@ AssetItemTree build_filtered_all_catalog_tree( return {std::move(catalogs_with_node_assets), std::move(assets_per_path), - std::move(unassigned_assets)}; + std::move(unassigned_assets), + false}; } } // namespace blender::ed::asset diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc index d5f15adb170..b39d0622cda 100644 --- a/source/blender/editors/geometry/node_group_operator.cc +++ b/source/blender/editors/geometry/node_group_operator.cc @@ -787,7 +787,7 @@ void clear_operator_asset_trees() for (const ObjectType type : {OB_MESH, OB_CURVES, OB_POINTCLOUD}) { for (const eObjectMode mode : {OB_MODE_OBJECT, OB_MODE_EDIT, OB_MODE_SCULPT_CURVES}) { if (asset::AssetItemTree *tree = get_static_item_tree(type, mode)) { - *tree = {}; + tree->dirty = true; } } } @@ -1105,7 +1105,7 @@ void ui_template_node_operator_asset_root_items(uiLayout &layout, const bContext if (!tree) { return; } - if (tree->assets_per_path.size() == 0) { + if (tree->dirty) { *tree = build_catalog_tree(C, *active_object); } ``` Either way though, the stuff in that profile is probably worth optimizing, since asset libraries will only continue to grow in the future. In particular it's absurd how much time is spent checking if a file is hidden.

Anton Raves commented

2024-04-11 14:02:22 +02:00

Is this something that could be backported to the upcoming Blender 4.1.1 as well...?

Aras Pranckevicius commented

2024-04-11 16:28:08 +02:00

I'll look at the cost of is_hidden_dot_filename function itself.

I'll look at the cost of `is_hidden_dot_filename` function itself.

Aras Pranckevicius referenced this issue

2024-04-11 20:20:57 +02:00

BLI: factor out BLI_path_has_hidden_component, fix it and speed it up #120541

Hans Goudey referenced this issue from a commit

2024-04-11 23:27:29 +02:00

Geometry Nodes: Avoid repeated node tools lookup when empty

Hans Goudey closed this issue

2024-04-11 23:27:30 +02:00

Blender Bot added

and removed

labels 2024-04-11 23:27:31 +02:00

Hans Goudey commented

2024-04-11 23:30:05 +02:00

I didn't mean for 52cff75ce0 to automatically close this, but I'm pretty confident that will be the solution so I'll leave it like that for now. @passivestar, could you test the next daily build to check if it fixes the issue for you? If so, the commit is simple and can be backported to 4.1.

Optimizing this is still worth it anyway, because this data still has to be calculated when Blender starts.

I didn't mean for 52cff75ce08092a2f9a4ba46899bbf097988f618 to automatically close this, but I'm pretty confident that will be the solution so I'll leave it like that for now. @passivestar, could you test the next daily build to check if it fixes the issue for you? If so, the commit is simple and can be backported to 4.1. Optimizing this is still worth it anyway, because this data still has to be calculated when Blender starts.

passivestar commented

2024-04-12 00:26:57 +02:00

@passivestar, could you test the next daily build to check if it fixes the issue for you?

will do 👍

> @passivestar, could you test the next daily build to check if it fixes the issue for you? will do 👍

passivestar commented

2024-04-13 05:53:05 +02:00

Works well in the latest 4.2 build, thanks for the fix 🎉 🙌

👍 1 🎉 1

Hans Goudey referenced this issue

2024-04-15 15:36:26 +02:00

4.1: Candidates for corrective releases #119631

Thomas Dinges referenced this issue from a commit

2024-04-15 16:03:08 +02:00

Geometry Nodes: Avoid repeated node tools lookup when empty

Julian Eisel referenced this issue

2024-04-16 15:09:22 +02:00

Assets: Speed up iterating over asset libraries #120699

Aras Pranckevicius referenced this issue from a commit

2024-04-16 16:51:45 +02:00

BLI: factor out BLI_path_has_hidden_component, fix it and speed it up

Julian Eisel referenced this issue from a commit

2024-04-16 17:09:01 +02:00

Assets: Speed up iterating over asset libraries

Julian Eisel commented

2024-04-16 17:11:23 +02:00

Committed 19dbcf5fc1 which should significantly improve the speed of AssetList::iterate() for large asset libraries in this case and similar ones. See #120699 for benchmarks.

Committed 19dbcf5fc1 which should significantly improve the speed of `AssetList::iterate()` for large asset libraries in this case and similar ones. See #120699 for benchmarks.

Sign in to join this conversation.

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Poor redo panel performance when using a big asset library #120494