diff --git a/platform/platform-impl/src/com/intellij/internal/performance/EditorRenderingBenchmarkAction.java b/platform/platform-impl/src/com/intellij/internal/performance/EditorRenderingBenchmarkAction.java
new file mode 100644
index 000000000000..af758c1219a0
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/internal/performance/EditorRenderingBenchmarkAction.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.internal.performance;
+
+import com.intellij.notification.NotificationGroup;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.MessageType;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Measures editor rendering performance, in FPS.
+ * <p>
+ * This action can also be useful for making CPU snapshots to improve the rendering.
+ * <p>
+ * We may enhance the action by providing a frequency distribution graph.
+ */
+public class EditorRenderingBenchmarkAction extends AnAction implements DumbAware {
+  private static final int PERIOD = 5; // s
+
+  private final NotificationGroup myNotificationGroup = NotificationGroup.logOnlyGroup("editor-rendering-benchmark");
+
+  @Override
+  public void actionPerformed(AnActionEvent e) {
+    Project project = e.getData(CommonDataKeys.PROJECT);
+
+    Editor editor = e.getData(CommonDataKeys.EDITOR);
+
+    if (editor == null) {
+      myNotificationGroup
+        .createNotification("No active editor", MessageType.ERROR)
+        .notify(project);
+      return;
+    }
+
+    myNotificationGroup
+      .createNotification(String.format("Benchmarking the editor for %s seconds...", PERIOD), MessageType.INFO)
+      .notify(project);
+
+    ApplicationManager.getApplication().invokeLater(() -> {
+      JComponent component = editor.getComponent();
+      Rectangle r = component.getVisibleRect();
+
+      long threshold = System.currentTimeMillis() + PERIOD * 1000;
+
+      int n = 0;
+      while (true) {
+        component.paintImmediately(r);
+        n++;
+        if (System.currentTimeMillis() >= threshold) {
+          break;
+        }
+      }
+
+      double fps = (double)n / PERIOD;
+
+      myNotificationGroup
+        .createNotification(String.format("Benchmark results: %.1f FPS (%d x %d)", fps, r.width, r.height), MessageType.INFO)
+        .notify(project);
+    });
+  }
+}
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index ee6a165d818a..30d0875d8dd4 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -721,6 +721,9 @@
                 text="Add Test Notification"/>
         <action id="TestMessageBoxAction" internal="true" class="com.intellij.diagnostic.TestMessageBoxAction" text="Show Test Dialog"/>
         <separator/>
+        <action id="EditorRenderingBenchmarkAction" internal="true" class="com.intellij.internal.performance.EditorRenderingBenchmarkAction"
+                text="Editor Rendering Benchmark"/>
+        <separator/>
         <group id="Internal.focusAndModality" popup="true" text="Focus and modality testing">
           <action id="CheckMessagesButtonsOrderAction" internal="true" class="com.intellij.internal.validation.CheckMessagesButtonsOrderAction"
                   text="Check Messages Buttons Order"/>